HmiStatus modify

HU DCHECK occurs during multisession registration
Remove unused variable
SIGSEGV handler added to flush logger queue
FixIncomplete device list in UpdateDeviceList request
Fix Memory leak on PutFile break
Fix Thread and Timer
Fix OnHmiStatus Notification
Fix Url array sending for endpoints.
Fix HashChange
Fix SDL parse incoming JSON message with both members error and result as success message
Fix Core crashes while connecting mobile app

Signed-off-by: Justin Dickow <jjdickow@gmail.com>

810 files changed, 4089 insertions, 2638 deletions

diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt
index 07d8de458e..01e019b680 100644
--- a/src/components/application_manager/CMakeLists.txt
+++ b/src/components/application_manager/CMakeLists.txt
@@ -35,15 +35,13 @@ file (GLOB SOURCES
 set (POLICIES_MANAGER
 ${AM_SOURCE_DIR}/src/policies/policy_handler.cc
 ${AM_SOURCE_DIR}/src/policies/policy_event_observer.cc
+${AM_SOURCE_DIR}/src/policies/delegates/app_permission_delegate.cc
+${AM_SOURCE_DIR}/src/policies/delegates/statistics_delegate.cc
 )
 
   include_directories(
     ${COMPONENTS_DIR}/policy/src/policy/policy_table/table_struct
   )
-  list(APPEND POLICIES_MANAGER
-    ${AM_SOURCE_DIR}/src/policies/pt_exchange_handler_impl.cc
-    ${AM_SOURCE_DIR}/src/policies/policy_retry_sequence.cc
-  )
 
 file (GLOB EVENT_ENGINE
   ${AM_SOURCE_DIR}/src/event_engine/*
diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h
index 5f1f598851..4e56bfec94 100644
--- a/src/components/application_manager/include/application_manager/application.h
+++ b/src/components/application_manager/include/application_manager/application.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -36,6 +36,7 @@
 #include <string>
 #include <map>
 #include "utils/shared_ptr.h"
+#include "utils/data_accessor.h"
 #include "interfaces/MOBILE_API.h"
 #include "connection_handler/device.h"
 #include "application_manager/message.h"
@@ -164,6 +165,7 @@ class DynamicApplicationData {
     virtual const smart_objects::SmartObject* menu_title() const = 0;
     virtual const smart_objects::SmartObject* menu_icon() const = 0;
 
+    virtual void load_global_properties(const smart_objects::SmartObject& so) = 0;
     virtual void set_help_prompt(
       const smart_objects::SmartObject& help_prompt) = 0;
     virtual void set_timeout_prompt(
@@ -268,7 +270,7 @@ class DynamicApplicationData {
      *
      * @return ChoiceSet map that is currently in use
      */
-    virtual const PerformChoiceSetMap&
+    virtual DataAccessor<PerformChoiceSetMap>
     performinteraction_choice_set_map() const = 0;
 
     /*
@@ -285,17 +287,17 @@ class DynamicApplicationData {
     /*
      * @brief Retrieve application commands
      */
-    virtual const CommandsMap& commands_map() const = 0;
+    virtual DataAccessor<CommandsMap> commands_map() const = 0;
 
     /*
      * @brief Retrieve application sub menus
      */
-    virtual const SubMenuMap& sub_menu_map() const = 0;
+    virtual DataAccessor<SubMenuMap> sub_menu_map() const = 0;
 
     /*
      * @brief Retrieve application choice set map
      */
-    virtual const ChoiceSetMap& choice_set_map() const = 0;
+    virtual DataAccessor<ChoiceSetMap> choice_set_map() const = 0;
 
     /*
      * @brief Sets perform interaction state
@@ -391,6 +393,7 @@ class Application : public virtual InitialApplicationData,
     virtual void CloseActiveMessage() = 0;
     virtual bool IsFullscreen() const = 0;
     virtual bool MakeFullscreen() = 0;
+    virtual void ChangeSupportingAppHMIType() = 0;
     virtual bool IsAudible() const = 0;
     virtual void MakeNotAudible() = 0;
     virtual bool allowed_support_navigation() const = 0;
diff --git a/src/components/application_manager/include/application_manager/application_data_impl.h b/src/components/application_manager/include/application_manager/application_data_impl.h
index 556eee4349..494cfb1bce 100644
--- a/src/components/application_manager/include/application_manager/application_data_impl.h
+++ b/src/components/application_manager/include/application_manager/application_data_impl.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_DATA_IMPL_H_
 
 #include <string>
+#include "utils/lock.h"
 #include "smart_objects/smart_object.h"
 #include "application_manager/application.h"
 #include "interfaces/MOBILE_API.h"
@@ -89,6 +90,7 @@ class DynamicApplicationDataImpl : public virtual Application {
     const smart_objects::SmartObject* menu_title() const;
     const smart_objects::SmartObject* menu_icon() const;
 
+    void load_global_properties(const smart_objects::SmartObject& properties_so);
     void set_help_prompt(const smart_objects::SmartObject& help_prompt);
     void set_timeout_prompt(const smart_objects::SmartObject& timeout_prompt);
     void set_vr_help_title(const smart_objects::SmartObject& vr_help_title);
@@ -180,7 +182,7 @@ class DynamicApplicationDataImpl : public virtual Application {
      *
      * @return ChoiceSet map that is currently in use
      */
-    inline const PerformChoiceSetMap& performinteraction_choice_set_map() const;
+    inline DataAccessor<PerformChoiceSetMap> performinteraction_choice_set_map() const;
 
     /*
      * @brief Retrieves choice set that is currently in use by perform
@@ -196,17 +198,17 @@ class DynamicApplicationDataImpl : public virtual Application {
     /*
      * @brief Retrieve application commands
      */
-    inline const CommandsMap& commands_map() const;
+    inline DataAccessor<CommandsMap> commands_map() const;
 
     /*
      * @brief Retrieve application sub menus
      */
-    inline const SubMenuMap& sub_menu_map() const;
+    inline DataAccessor<SubMenuMap> sub_menu_map() const;
 
     /*
      * @brief Retrieve application choice set map
      */
-    inline const ChoiceSetMap& choice_set_map() const;
+    inline DataAccessor<ChoiceSetMap> choice_set_map() const;
 
     /*
      * @brief Sets perform interaction state
@@ -279,27 +281,41 @@ class DynamicApplicationDataImpl : public virtual Application {
 
 
     CommandsMap commands_;
+    mutable sync_primitives::Lock commands_lock_;
     SubMenuMap sub_menu_;
+    mutable sync_primitives::Lock sub_menu_lock_;
     ChoiceSetMap choice_set_map_;
+    mutable sync_primitives::Lock choice_set_map_lock_;
     PerformChoiceSetMap performinteraction_choice_set_map_;
+    mutable sync_primitives::Lock performinteraction_choice_set_lock_;
     uint32_t is_perform_interaction_active_;
     uint32_t perform_interaction_ui_corrid_;
     bool is_reset_global_properties_active_;
     int32_t perform_interaction_mode_;
   private:
+    void SetGlobalProperties(const smart_objects::SmartObject& param,
+                             void (DynamicApplicationData::*callback)(
+                               const NsSmartDeviceLink::NsSmartObjects::SmartObject&));
     DISALLOW_COPY_AND_ASSIGN(DynamicApplicationDataImpl);
 };
 
-const CommandsMap& DynamicApplicationDataImpl::commands_map() const {
-  return commands_;
+DataAccessor<CommandsMap> DynamicApplicationDataImpl::commands_map() const {
+  return DataAccessor<CommandsMap>(commands_, commands_lock_);
 }
 
-const SubMenuMap& DynamicApplicationDataImpl::sub_menu_map() const {
-  return sub_menu_;
+DataAccessor<SubMenuMap> DynamicApplicationDataImpl::sub_menu_map() const {
+  return DataAccessor<SubMenuMap>(sub_menu_, sub_menu_lock_);
 }
 
-const ChoiceSetMap& DynamicApplicationDataImpl::choice_set_map() const {
-  return choice_set_map_;
+DataAccessor<ChoiceSetMap> DynamicApplicationDataImpl::choice_set_map() const {
+  return DataAccessor<ChoiceSetMap>(choice_set_map_, choice_set_map_lock_);
+}
+
+DataAccessor<PerformChoiceSetMap>
+DynamicApplicationDataImpl::performinteraction_choice_set_map() const {
+  return DataAccessor<PerformChoiceSetMap>(
+           performinteraction_choice_set_map_,
+           performinteraction_choice_set_lock_);
 }
 
 uint32_t DynamicApplicationDataImpl::is_perform_interaction_active() const {
@@ -314,11 +330,6 @@ bool DynamicApplicationDataImpl::is_reset_global_properties_active() const {
   return is_reset_global_properties_active_;
 }
 
-const PerformChoiceSetMap&
-DynamicApplicationDataImpl::performinteraction_choice_set_map() const {
-  return performinteraction_choice_set_map_;
-}
-
 inline int32_t DynamicApplicationDataImpl::perform_interaction_mode() const {
   return perform_interaction_mode_;
 }
diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h
index dadfce0929..fda0837d6b 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -71,6 +71,11 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   void CloseActiveMessage();
   bool IsFullscreen() const;
   bool MakeFullscreen();
+
+  /**
+   * @brief change supporting COMMUNICATION NAVIGATION
+   */
+  virtual void ChangeSupportingAppHMIType();
   bool IsAudible() const;
   void MakeNotAudible();
 
@@ -151,7 +156,6 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
 
   virtual uint32_t nextHash();
   virtual uint32_t curHash() const;
-
   /**
    * @brief Change Hash for current application
    * and send notification to mobile
@@ -231,7 +235,6 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   UsageStatistics                          usage_report_;
   ProtocolVersion                          protocol_version_;
   bool                                     is_voice_communication_application_;
-
   // NAVI retry stream
   volatile bool                            is_video_stream_retry_active_;
   volatile bool                            is_audio_stream_retry_active_;
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
index dacac9e010..3b099cca0a 100644
--- a/src/components/application_manager/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -47,7 +47,7 @@
 #include "protocol_handler/protocol_observer.h"
 #include "hmi_message_handler/hmi_message_observer.h"
 #include "hmi_message_handler/hmi_message_sender.h"
-
+#include "application_manager/policies/policy_handler_observer.h"
 #include "media_manager/media_manager_impl.h"
 
 #include "connection_handler/connection_handler_observer.h"
@@ -74,10 +74,6 @@
 #include "utils/lock.h"
 #include "utils/singleton.h"
 
-namespace policy {
-class PolicyManager;
-}
-
 namespace NsSmartDeviceLink {
 namespace NsSmartObjects {
 class SmartObject;
@@ -163,15 +159,26 @@ typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageFromMobile> >
 typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageToMobile> > ToMobileQueue;
 typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageFromHmi> > FromHmiQueue;
 typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageToHmi> > ToHmiQueue;
+
+// AudioPassThru
+typedef struct  {
+std::vector<uint8_t> binary_data;
+int32_t              session_key;
+} AudioData;
+typedef std::queue<AudioData>                          RawAudioDataQueue;
+typedef threads::MessageLoopThread<RawAudioDataQueue>  AudioPassThruQueue;
 }
+
 typedef std::vector<std::string> RPCParams;
 
 class ApplicationManagerImpl : public ApplicationManager,
   public hmi_message_handler::HMIMessageObserver,
   public protocol_handler::ProtocolObserver,
   public connection_handler::ConnectionHandlerObserver,
+  public policy::PolicyHandlerObserver,
   public impl::FromMobileQueue::Handler, public impl::ToMobileQueue::Handler,
   public impl::FromHmiQueue::Handler, public impl::ToHmiQueue::Handler,
+  public impl::AudioPassThruQueue::Handler,
   public utils::Singleton<ApplicationManagerImpl> {
 
     friend class ResumeCtrl;
@@ -303,12 +310,6 @@ class ApplicationManagerImpl : public ApplicationManager,
         mobile_api::AppInterfaceUnregisteredReason::eType reason);
 
     /*
-     * @brief Called by HMI on SUSPEND.
-     * SDL must save all persistence data(Resume, Policy)
-     */
-    void HeadUnitSuspend();
-
-    /*
      * @brief Closes all registered applications
      */
     void UnregisterAllApplications(bool generated_by_hmi = false);
@@ -391,6 +392,20 @@ class ApplicationManagerImpl : public ApplicationManager,
      */
     void set_all_apps_allowed(const bool& allowed);
 
+
+    /**
+     * @brief Notification from PolicyHandler about PTU.
+     * Compares AppHMIType between saved in app and received from PTU. If they are different method sends:
+     * UI_ChangeRegistration with list new AppHMIType;
+     * ActivateApp with HMI level BACKGROUND;
+     * OnHMIStatus notification;
+     * for app with HMI level FULL or LIMITED.
+     * method sends:
+     * UI_ChangeRegistration with list new AppHMIType
+     * for app with HMI level BACKGROUND.
+     */
+    virtual void OnUpdateHMIAppType(std::map<std::string, std::vector<std::string> > app_hmi_types);
+
     /*
      * @brief Starts audio pass thru thread
      *
@@ -412,8 +427,17 @@ class ApplicationManagerImpl : public ApplicationManager,
      */
     void StopAudioPassThru(int32_t application_key);
 
+    /*
+     * @brief Creates AudioPassThru data chunk and inserts it
+     * to audio_pass_thru_messages_
+     *
+     * @param session_key Id of application for which
+     * audio pass thru should be sent
+     *
+     * @param binary_data AudioPassThru data chunk
+     */
     void SendAudioPassThroughNotification(uint32_t session_key,
-                                          std::vector<uint8_t> binaryData);
+                                          std::vector<uint8_t>& binary_data);
 
     std::string GetDeviceName(connection_handler::DeviceHandle handle);
 
@@ -441,31 +465,27 @@ class ApplicationManagerImpl : public ApplicationManager,
       const utils::SharedPtr<smart_objects::SmartObject> message);
 
     /////////////////////////////////////////////////////////
-    /*
-     * @brief Overriden ProtocolObserver method
-     */
+    // Overriden ProtocolObserver method
     virtual void OnMessageReceived(
-        const ::protocol_handler::RawMessagePtr message);
-
-    /*
-     * @brief Overriden ProtocolObserver method
-     */
+        const ::protocol_handler::RawMessagePtr message) OVERRIDE;
     virtual void OnMobileMessageSent(
-        const ::protocol_handler::RawMessagePtr message);
+        const ::protocol_handler::RawMessagePtr message) OVERRIDE;
 
-    void OnMessageReceived(hmi_message_handler::MessageSharedPointer message);
-    void OnErrorSending(hmi_message_handler::MessageSharedPointer message);
+    // Overriden HMIMessageObserver method
+    void OnMessageReceived(hmi_message_handler::MessageSharedPointer message) OVERRIDE;
+    void OnErrorSending(hmi_message_handler::MessageSharedPointer message) OVERRIDE;
 
-    void OnDeviceListUpdated(const connection_handler::DeviceMap& device_list);
+    // Overriden ConnectionHandlerObserver method
+    void OnDeviceListUpdated(const connection_handler::DeviceMap& device_list) OVERRIDE;
     //TODO (EZamakhov): fix all indentations in this file
-  virtual void OnFindNewApplicationsRequest();
-    void RemoveDevice(const connection_handler::DeviceHandle& device_handle);
+    void OnFindNewApplicationsRequest() OVERRIDE;
+    void RemoveDevice(const connection_handler::DeviceHandle& device_handle) OVERRIDE;
     bool OnServiceStartedCallback(
-      const connection_handler::DeviceHandle& device_handle,
-      const int32_t& session_key, const protocol_handler::ServiceType& type);
+        const connection_handler::DeviceHandle& device_handle,
+        const int32_t& session_key, const protocol_handler::ServiceType& type) OVERRIDE;
     void OnServiceEndedCallback(const int32_t& session_key,
-                                const protocol_handler::ServiceType& type);
-
+                                const protocol_handler::ServiceType& type) OVERRIDE;
+    void OnApplicationFloodCallBack(const uint32_t& connection_key) OVERRIDE;
     /**
      * @ Add notification to collection
      *
@@ -667,6 +687,15 @@ class ApplicationManagerImpl : public ApplicationManager,
         mobile_apis::FunctionID::eType function_id,
         const RPCParams& rpc_params,
         CommandParametersPermissions* params_permissions = NULL);
+    /*
+     * @brief Function Should be called when Low Voltage is occured
+     */
+    void OnLowVoltage();
+
+    /*
+     * @brief Function Should be called when WakeUp occures after Low Voltage
+     */
+    void OnWakeUp();
 
     // typedef for Applications list
     typedef const std::set<ApplicationSharedPtr> TAppList;
@@ -717,6 +746,22 @@ class ApplicationManagerImpl : public ApplicationManager,
   private:
     ApplicationManagerImpl();
 
+    /**
+     * @brief Method transforms string to AppHMIType
+     * @param str contains string AppHMIType
+     * @return enum AppHMIType
+     */
+    mobile_apis::AppHMIType::eType StringToAppHMIType(std::string str);
+
+    /**
+     * @brief Method compares arrays of app HMI type
+     * @param from_policy contains app HMI type from policy
+     * @param from_application contains app HMI type from application
+     * @return return TRUE if arrays of appHMIType equal, otherwise return FALSE
+     */
+    bool CompareAppHMIType (const smart_objects::SmartObject& from_policy,
+                            const smart_objects::SmartObject& from_application);
+
     hmi_apis::HMI_API& hmi_so_factory();
     mobile_apis::MOBILE_API& mobile_so_factory();
 
@@ -747,6 +792,9 @@ class ApplicationManagerImpl : public ApplicationManager,
     // CALLED ON messages_to_hmi_ thread!
     virtual void Handle(const impl::MessageToHmi message) OVERRIDE;
 
+    // CALLED ON audio_pass_thru_messages_ thread!
+    virtual void Handle(const impl::AudioData message) OVERRIDE;
+
     void SendUpdateAppList(const std::list<uint32_t>& applications_ids);
     void OnApplicationListUpdateTimer();
 
@@ -756,6 +804,11 @@ class ApplicationManagerImpl : public ApplicationManager,
      */
     void SendOnSDLClose();
 
+    /*
+     * @brief returns true if low voltage state is active
+     */
+    bool IsLowVoltage();
+
   private:
 
     // members
@@ -831,6 +884,8 @@ class ApplicationManagerImpl : public ApplicationManager,
     impl::FromHmiQueue messages_from_hmi_;
     // Thread that pumps messages being passed to HMI.
     impl::ToHmiQueue messages_to_hmi_;
+    // Thread that pumps messages audio pass thru to mobile.
+    impl::AudioPassThruQueue audio_pass_thru_messages_;
 
 
     HMICapabilities                         hmi_capabilities_;
@@ -844,6 +899,7 @@ class ApplicationManagerImpl : public ApplicationManager,
      */
     ResumeCtrl resume_ctrl_;
 
+
 #ifdef TIME_TESTER
     AMMetricObserver* metric_observer_;
 #endif  // TIME_TESTER
@@ -860,6 +916,7 @@ class ApplicationManagerImpl : public ApplicationManager,
 
     timer::TimerThread<ApplicationManagerImpl>  tts_global_properties_timer_;
 
+    bool is_low_voltage_;
     DISALLOW_COPY_AND_ASSIGN(ApplicationManagerImpl);
 
     FRIEND_BASE_SINGLETON_CLASS(ApplicationManagerImpl);
diff --git a/src/components/application_manager/include/application_manager/commands/command.h b/src/components/application_manager/include/application_manager/commands/command.h
index 587c3d834c..65eb8c143c 100644
--- a/src/components/application_manager/include/application_manager/commands/command.h
+++ b/src/components/application_manager/include/application_manager/commands/command.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/include/application_manager/commands/command_impl.h b/src/components/application_manager/include/application_manager/commands/command_impl.h
index a34716bd62..d444298ce7 100644
--- a/src/components/application_manager/include/application_manager/commands/command_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_impl.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/include/application_manager/commands/command_request_impl.h b/src/components/application_manager/include/application_manager/commands/command_request_impl.h
index 1bbba5aa0b..1c33bc4bf0 100644
--- a/src/components/application_manager/include/application_manager/commands/command_request_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_request_impl.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h
index 3495ce1377..7d1b294c86 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -52,7 +52,7 @@ class ActivateAppRequest : public RequestToHMI, event_engine::EventObserver {
     explicit ActivateAppRequest(const MessageSharedPtr& message);
 
     /**
-     * @brief Calback for response
+     * @brief Callback for response
      *
      * @param event - event response
      **/
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h
index 1df9bc095a..a15d317077 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h
index 1569af434d..1aa3b7a512 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h
index 6c2db489ce..3d42b6d5a6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h
index 0eb8184fa8..ccc8d5ae7d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h
index 91228440a2..e90576a7df 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h
index 5a24ac1a74..6bedf30a38 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_on_awake_sdl.h b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_on_awake_sdl.h
new file mode 100644
index 0000000000..f789a14780
--- /dev/null
+++ b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_on_awake_sdl.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2013, Ford Motor Company
+ * 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 Ford Motor Company 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 HOLDER 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/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h
index d066df813e..867596f189 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h
index 1948211c48..5c174eac85 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h
index 3c9fbac684..639800a047 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h
index 067954537d..7cd174477b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h
index 72ff8a2c5b..34722bc4f1 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h
index 05318e3cb9..ce3a6d2936 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h
index 8cb34718a1..8262dbb6fa 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h
index f10c07c52f..70983d3ce3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h
index 9241446676..551ab20431 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h
index 6b025142e2..956e5a788e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h
index 905b5b3836..2957693c9e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h
index c8bfe4e156..e2b5affe34 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h
index 1e2a39df94..58f85f829a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h
index 41e0f623f1..11f46d5da8 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h
index a321d32dd9..97de7102f7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h
index a31efc7fe4..e779ecb699 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h
index 0fbad35154..3da6933bc3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h
index 9c91df648a..45474b532a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h
index 029d903192..ef9a605c36 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h
index 5da47e580b..b866ce3e1f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h
index 4a26b26b09..3f212985f9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h
index f43b992219..5b73e2dbab 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h
index 61beef1b3b..a5e2f8bf37 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h
index 9e711b8be9..0e15a9175c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h
index aa549638e4..6ec14e35b0 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h
index a8bdeb6c91..011df3832c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h
index 4c56dc4158..8731fc43f1 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h
index 034efb7a8c..c6ea82a15c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h
index a5037820cc..ea36d55b39 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h
index 4364aa9a35..1ebbfcd483 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h
index d8470af396..96fd19e9bc 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h
index a4657ea24e..0a56d7d924 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h
index 065cdc4a72..ce5f1de8f1 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h
index e980bfe41b..17ba26b7f7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h
index 5c12bdfd9f..b87a6e2d9f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h
index 77da5cf3b2..01a87aae05 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h
index c913509e5e..65d78f60c6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h
index b78c0e2afe..479dd3a09c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h
index b6b46041f8..cc47705c82 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h b/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h
index 2499129b2c..f9fb9cdb21 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h
index ed0638f3cc..f8fccdc382 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h
index 6e42e1a0cd..a657ffcc68 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_play_tone_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_play_tone_notification.h
index 8e463c3276..ceba0528fa 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_play_tone_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_play_tone_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h
index f71de540e5..81278fb75a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h
index 839af785be..bc60284309 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h
index a3e2dd731d..24fc52deac 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h
index 38a4470d22..0eeb28218f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h
index 81f0b5bdda..67cccdd816 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h
index c27e2e5ee8..03f84d0907 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h
index e6b4418d6d..5b9ac04e8f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h
index c9b93a4dcf..4f30873e4e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h
index 5da06ef34c..6f8f3a6e1a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h
index 3e4dc1daf4..bfa14f67fc 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h
index ae85d13713..c123826886 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h
index b16df6069e..35d6f49daa 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h
index cb3fc12017..ee7df7acd6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h
index d0bcadfaac..9b6c62782c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h
index 6e3a0eea7f..f1d25e24a4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h
index d9b55ac0c1..79ae9b496e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h
index 3bafc920b7..11cb755544 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h
index 8cb6256074..c7e88ac558 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h
index 31fb6fb31c..bf5dc7fb9e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h
index 1d0aaf3078..b4a0228c78 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h
index bb0a6a72d3..77b771065b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h
index 85b8f60c4d..bcb661c89d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h
index 511606d077..f97c8768b5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h
index 3231d1ca29..6d8005e12f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h b/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h
index c0d355c925..f56d01a5cc 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h
index 04bb3e54bc..d591ab2be6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h
index 3cfb048cdc..f901462fdf 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h
index b9ecf5a34b..a0bc31778a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h
index 925989e8c6..0e24616f3e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h
index 7baea90651..0290388756 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h
index 33dd824c6e..8307e5359e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h
index 207302a373..be5b086853 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h
index 535758db25..83e6f845e0 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h
index 92dffd89b3..42a6b8e0d9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h
index d8f2a768fc..01c2cf60b6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h
index 47802e97eb..dc80b33ddd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h
index fe38412980..c4e5accead 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h
index d636b6e779..e2d9d91ae1 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h
index 1cf4c25878..7c1c691ac5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h
index 5a3a136374..bf2ca83f8f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h
index 80dea2a6e2..ebcfe3a86c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h
index 19bffabf4f..37bf66e4d0 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h
index 0826cb6c6f..bf01b2bf76 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h
index ba8eceefc3..1c1e00d893 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h
index 30ad9d6acc..59da271a04 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h
index 0cb5fb17d2..06b73c508d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h
index c7a1a6bd62..399b38112e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h
index 677bc26727..37bc2556f8 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h
index 24c60c32d9..be408f0aa0 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h
index cc78f010b6..5ae5ace27b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h
index 2ee8ad429e..311ee8acde 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h
index 39ebd95819..b9b3ec3597 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h
@@ -1,4 +1,4 @@
-  /**
+  /*
    Copyright (c) 2014, Ford Motor Company
    All rights reserved.
 
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h
index 3a9de4b7b5..fe359182dd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h
index 21497a1335..c888807e96 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h
index db4a93b0b5..2505b39acc 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h
index 63adc6c0d3..bf0789e60e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h
index 5da473b1a7..7c8f10529b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h
index 5de9fc0ea8..452784d92c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h
index a098e0a113..cb7d37d336 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h
index 6299cde630..a3fc0862b5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h
index b729a16170..96f46cfa3d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h
index bb7a7f8e20..4cf7be56c9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h
index ee2b9865c8..481f37a257 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h
index b6ab925fd6..d3f7105523 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h
index a587af950b..a25309e5d5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h
index 3a9e9fda51..73ad180286 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h
index 73edd9de73..543945e8ef 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h
index 71f85d68e3..2fc16d1a40 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h
index 94e38ec473..e0ae0da0c4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h
index bd67d64f32..0d9df07ae6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h
index ff80dd2389..136edbb5f4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h
index 244f223460..38e3c673bb 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h
index dc58d852ea..676faabc01 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h
index 375e5a5d1f..12bb3bb870 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h
index b398e0b2d2..92a260d77f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h
index adf0b70276..0766decf9f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h
index 326c638f4d..f5555f6495 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h
index e22c549871..541ea0d2ab 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h
index 0d82121fd7..46c464425d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h
index b9055bfbe5..aab8ca8c5b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h
index ffd6eeeefd..6b857818e7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h
index f84b71d0f1..c6a02fdd03 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h
index 1227de0463..bba9a4c47e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h
index 1b3a10729e..0c4afc2fa3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h
index 7395eb19e1..72cd733eb5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h
index 1d17d98095..97eb2ba94b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h
index 51276b7b0f..8e68dee2ec 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h
index edb7574e8d..50b092639b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h
index 398f78c28f..9eceb2eb6f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h
index bb19811908..c4d7ab6cac 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h
index 1b3747234b..24bf5878ff 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h
index 8bbab99468..05d77c82d7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h
index 9e8e11c1ad..06637fc8d4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h
index 740fc5501d..6d5594f69f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h
index 2d0469d6a6..ad9a566078 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h
index dc6052e049..ce6ad6f7ef 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h
index 4fca4826be..7371cd1031 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h
index ea43e3856d..f6536452ce 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h
index cc0e70feae..d0975e68da 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h
index 15e400687f..c888c7b208 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h
index 5e2cb7ef9f..7cb4287244 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h
index bc7210f2a8..64106654e9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h
index 94bc4827a9..69566324f2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h
index 04afedfba0..c3283101f9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h
index 0d63139437..d8e2f6c682 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h
index 32a87c73c2..04286897a3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h
index 6f23d3b21c..06bfadbae7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h
index 7bf15a0511..6d6d09c313 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h
index 74df2030e5..3e7a898af0 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h
index f3f7d0e733..8b54e85332 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h
index bc00397e37..b3cb38d49f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h
index 1541aada6b..f78772a8a3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h
index f125f64282..288bcc94d2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h
index 44cbbbfcf9..443fc8d1a7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h
index dd46f128d9..9358707117 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h
index 6f22263e61..136a99622b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h
index a6391fa6c9..4a9b49253e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h
index 5cb31b4a95..8a3b37bfef 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h
index aae5408e21..2384f248aa 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h
index d2307232e3..b606134409 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h
index 3e6a1d78a2..135481cb0b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h
index e9a32e9fc4..f645d312c5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h
index d4191c8bee..6ea2c1e528 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h
index 506c137861..f84f93f2ed 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h
index 729483cfa1..b0d370ecfd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h
index 90e1e145c2..c60533d2ea 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h
index f332a32812..027e007e42 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h
index 93f046d7d6..170eb895fd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h
index 9ee7fac44a..3ba4656d5b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h
index 9cb964981c..7413b6bf3b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h
index 951bf0c334..af991186fd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h
index 952b0fb4d3..1f9736b56a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h
index ecd465365a..156664cac3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h
index 876f7d2e55..67d8ae046c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h
index 8b632182f0..b36b193418 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h
index e905cf4c09..061681029a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h
index e13e368b34..52e00f85da 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h
index 336ad4443a..6520db5e7d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h
index af66505174..0855be454b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h
index ef14a05f2d..1eb06c6217 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h
index bcfa2f6f1a..fc9b7dd2ea 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h
index 057fd52e13..b5e2788f32 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h
index 740d8c386a..64f3c51cbc 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h
index 18d118fadb..1320ae477a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
index d604d4d536..9aa529d407 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h
index b71b8241f5..8818709afe 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
index 8730cc0361..3dfcc763cb 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h
index 3675cfb153..9fdc3f776f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h
index 328e8a2058..7418ed5865 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h
index 5e69b4c18b..53584ee970 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h
index f79da44598..d71a14da34 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h
index b843f498f8..91a5dc7d99 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h
index 11a681bd5e..ad8c82e38c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h
index 7771bdd141..676967083f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h
index ced60c9d65..8b88eb4e3b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h
index 955355d06c..9dd9133ffd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h
index 2bd59b8be2..d9c4fc2126 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h
index 79105978b0..0a010cdfec 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h
index 38f5056225..dbbe57ba36 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h
index ac734638b1..e66c9c36a5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h
index 4f4f86d84c..a9b1a68455 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h
index b71b31baf5..b819fdb927 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h
index fbf5b87cb6..ffbbd613e2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/change_registration_request.h b/src/components/application_manager/include/application_manager/commands/mobile/change_registration_request.h
index 3de3e8fc2f..d36f16a976 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/change_registration_request.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/change_registration_request.h
@@ -105,9 +105,9 @@ class ChangeRegistrationRequest : public CommandRequestImpl  {
   /*
    * @brief Checks result codes
    *
-   * @return true if one of result codes is success
+   * @return true if all of result codes is success
    */
-  static bool WasAnySuccess(const hmi_apis::Common_Result::eType ui,
+   bool AllHmiResponsesSuccess(const hmi_apis::Common_Result::eType ui,
                      const hmi_apis::Common_Result::eType vr,
                      const hmi_apis::Common_Result::eType tts);
 
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/generic_response.h b/src/components/application_manager/include/application_manager/commands/mobile/generic_response.h
index c3b39bf917..1fb931d508 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/generic_response.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/generic_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h
index 9c1d46368f..14b51777dd 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h
@@ -99,23 +99,6 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl {
   bool IsApplicationWithSameAppIdRegistered();
 
   /*
-   * @brief Check for some request param. names restrictions, e.g. for
-   * newline characters
-   *
-   * return SUCCESS if param name pass the check, otherwise - error code
-   * will be returned
-   */
-  mobile_apis::Result::eType CheckRestrictions() const;
-
-  /*
-   * @brief Removes hidden symbols and spaces
-   *
-   * return cleared copy of param name
-   */
-  std::string ClearParamName(std::string param_name) const;
-
-
-  /*
    * @brief Check new application parameters (name, tts, vr) for
    * coincidence with already known parameters of registered applications
    *
@@ -163,6 +146,8 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl {
   bool IsWhiteSpaceExist();
 
   std::string response_info_;
+  mobile_apis::Result::eType result_checking_app_hmi_type_;
+
 
   DISALLOW_COPY_AND_ASSIGN(RegisterAppInterfaceRequest);
 };
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_response.h b/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_response.h
index 36fd311ad6..f0c0ea8f7a 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_response.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/send_location_response.h b/src/components/application_manager/include/application_manager/commands/mobile/send_location_response.h
index 6e18aa5f27..fe88a2af29 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/send_location_response.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/send_location_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_response.h b/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_response.h
index e835c17c80..46844bd2f3 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_response.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/show_response.h b/src/components/application_manager/include/application_manager/commands/mobile/show_response.h
index 970b54747e..c327bc3b3a 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/show_response.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/show_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/slider_response.h b/src/components/application_manager/include/application_manager/commands/mobile/slider_response.h
index b7821adca2..1888388e7c 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/slider_response.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/slider_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/speak_response.h b/src/components/application_manager/include/application_manager/commands/mobile/speak_response.h
index ef9b8f89d3..cbf1ec40de 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/speak_response.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/speak_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities.h b/src/components/application_manager/include/application_manager/hmi_capabilities.h
index 20a849baee..000242daf0 100644
--- a/src/components/application_manager/include/application_manager/hmi_capabilities.h
+++ b/src/components/application_manager/include/application_manager/hmi_capabilities.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/message.h b/src/components/application_manager/include/application_manager/message.h
index d92c89adf1..eec6795d7c 100644
--- a/src/components/application_manager/include/application_manager/message.h
+++ b/src/components/application_manager/include/application_manager/message.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index 69c7b7bba7..a4d1fa9f79 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -178,7 +178,7 @@ class MessageHelper {
     /**
      * @brief Sends IVI subscriptions
      */
-    static SmartObjectList GetIVISubscribtionRequests(const uint32_t app_id);
+    static SmartObjectList GetIVISubscriptionRequests(ApplicationSharedPtr app);
 
     static void SendAppDataToHMI(ApplicationConstSharedPtr app);
     static void SendGlobalPropertiesToHMI(ApplicationConstSharedPtr app);
@@ -192,6 +192,11 @@ class MessageHelper {
     static void SendAddCommandRequestToHMI(ApplicationConstSharedPtr app);
     static SmartObjectList CreateAddCommandRequestToHMI(ApplicationConstSharedPtr app);
 
+    /**
+     * @brief Sends UI_ChangeRegistration to HMI with list of AppHMIType
+     * @param app applicaton instace
+     */
+    static void SendUIChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app);
     static void SendChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app);
     static void SendAddVRCommandToHMI(
       uint32_t cmd_id, const smart_objects::SmartObject& vr_commands,
@@ -223,7 +228,8 @@ class MessageHelper {
                                                 bool is_unexpected_disconnect = false);
     static void SendActivateAppToHMI(
       uint32_t const app_id,
-      hmi_apis::Common_HMILevel::eType level = hmi_apis::Common_HMILevel::FULL);
+      hmi_apis::Common_HMILevel::eType level = hmi_apis::Common_HMILevel::FULL,
+      bool send_policy_priority = true);
 
     static void SendOnResumeAudioSourceToHMI(const uint32_t app_id);
 
@@ -421,6 +427,16 @@ class MessageHelper {
       smart_objects::SmartObject& message_params,
       ApplicationConstSharedPtr app);
 
+    /**
+     * @brief checkWithPolicy allows to check soft button's parameters
+     * according to the current policy
+     * @param system_action system action
+     * @param app_mobile_id policy application id
+     * @return
+     */
+    static bool CheckWithPolicy(int system_action,
+                                const std::string& app_mobile_id);
+
     /*
      * @brief subscribe application to softbutton
      *
@@ -481,7 +497,8 @@ class MessageHelper {
                                    smart_objects::SmartObject& message);
 
     static smart_objects::SmartObject* CreateChangeRegistration(
-      int32_t function_id, int32_t language, uint32_t app_id);
+      int32_t function_id, int32_t language, uint32_t app_id,
+      const smart_objects::SmartObject* app_types = NULL);
 
     MessageHelper();
 
diff --git a/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h b/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h
new file mode 100644
index 0000000000..55a4f146c2
--- /dev/null
+++ b/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h
@@ -0,0 +1,81 @@
+/*
+ Copyright (c) 2014, Ford Motor Company
+ 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 Ford Motor Company 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 HOLDER 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.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_
+
+
+#include "utils/threads/thread.h"
+#include "utils/threads/thread_delegate.h"
+#include "utils/conditional_variable.h"
+
+#include "policy/policy_types.h"
+
+namespace policy {
+
+  /**
+ * @brief The AppPermissionDelegate class allows to call OnAppPermissionConsent
+ * in async way.
+ */
+class AppPermissionDelegate: public threads::ThreadDelegate {
+  public:
+    /**
+     * @brief AppPermissionDelegate constructor, contains parameters
+     * which will be pass to the called function.
+     *
+     * @param connection_key connection key.
+     *
+     * @param permissions new permissions
+     */
+    AppPermissionDelegate(const uint32_t connection_key,
+                          const PermissionConsent &permissions);
+
+    /**
+     * @brief threadMain run the needed function.
+     */
+    virtual void threadMain();
+
+    /**
+     * @brief exitThreadMain do some stuff before exit from thread
+     *
+     * @return true in case when thread has been finished properly
+     */
+    virtual void exitThreadMain();
+
+  private:
+    uint32_t connection_key_;
+    PermissionConsent permissions_;
+};
+
+} // namespace policy
+
+#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_
diff --git a/src/components/application_manager/include/application_manager/policies/delegates/statistics_delegate.h b/src/components/application_manager/include/application_manager/policies/delegates/statistics_delegate.h
new file mode 100644
index 0000000000..9044a3fd33
--- /dev/null
+++ b/src/components/application_manager/include/application_manager/policies/delegates/statistics_delegate.h
@@ -0,0 +1,82 @@
+/*
+ Copyright (c) 2014, Ford Motor Company
+ 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 Ford Motor Company 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 HOLDER 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.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_STATISTICS_DELEGATE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_STATISTICS_DELEGATE_H_
+
+#include <string>
+
+#include "utils/threads/thread.h"
+#include "utils/threads/thread_delegate.h"
+#include "utils/conditional_variable.h"
+#include "application_manager/usage_statistics.h"
+
+namespace policy {
+
+  class StatisticsDelegate: public threads::ThreadDelegate {
+      enum StatisticType{
+        INCREMENT_GLOBAL,
+        INCREMENT_APP,
+        SET,
+        ADD
+      };
+    public:
+      explicit StatisticsDelegate(usage_statistics::GlobalCounterId type);
+
+      StatisticsDelegate(const std::string& app_id,
+                        usage_statistics::AppCounterId type);
+
+      StatisticsDelegate(const std::string& app_id,
+                        usage_statistics::AppInfoId type,
+                        const std::string& value);
+
+      StatisticsDelegate(const std::string& app_id,
+                        usage_statistics::AppStopwatchId type,
+                        int32_t timespan_seconds);
+
+      virtual void threadMain();
+
+      virtual void exitThreadMain();
+    private:
+      StatisticType type_;
+      usage_statistics::GlobalCounterId global_counter_;
+      usage_statistics::AppCounterId app_counter_;
+      usage_statistics::AppInfoId app_info_;
+      usage_statistics::AppStopwatchId stop_watch_;
+
+      std::string app_id_;
+      std::string value_;
+      int32_t timespan_seconds_;
+  };
+} // namespace policy
+
+#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_STATISTICS_DELEGATE_H_
diff --git a/src/components/application_manager/include/application_manager/policies/policy_event_observer.h b/src/components/application_manager/include/application_manager/policies/policy_event_observer.h
index 7fdfb4e0ac..e251170fec 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_event_observer.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_event_observer.h
@@ -34,26 +34,26 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_EVENT_OBSERVER_H_
 
 #include "application_manager/event_engine/event_observer.h"
-#include "utils/shared_ptr.h"
 
 namespace policy {
 namespace smart_objects = NsSmartDeviceLink::NsSmartObjects;
 
-class PolicyManager;
+class PolicyHandler;
 
 class PolicyEventObserver :
     public application_manager::event_engine::EventObserver {
  public:
-  PolicyEventObserver(utils::SharedPtr<PolicyManager> policy_manager);
+  explicit PolicyEventObserver(policy::PolicyHandler* const policy_handler);
+  void set_policy_handler(policy::PolicyHandler* const policy_handler);
   void on_event(const application_manager::event_engine::Event& event);
   void subscribe_on_event(
       const application_manager::event_engine::Event::EventID& event_id,
       int32_t hmi_correlation_id = 0);
  private:
-  utils::SharedPtr<PolicyManager> policy_manager_;
+  sync_primitives::Lock policy_handler_lock_;
+  PolicyHandler* policy_handler_;
   void ProcessOdometerEvent(const smart_objects::SmartObject& message);
 };
 
 }  //  namespace policy
-
 #endif  //  SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_EVENT_OBSERVER_H_
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index dfc29fe00a..260f2da060 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -39,10 +39,16 @@
 #include <vector>
 #include "policy/policy_manager.h"
 #include "application_manager/policies/policy_event_observer.h"
-#include "application_manager/policies/pt_exchange_handler.h"
+#include "application_manager/policies/delegates/statistics_delegate.h"
 #include "utils/logger.h"
 #include "utils/singleton.h"
+#include "utils/threads/thread.h"
+#include "utils/threads/thread_delegate.h"
+#include "utils/conditional_variable.h"
+#include "utils/rwlock.h"
 #include "usage_statistics/statistics_manager.h"
+#include "policy_handler_observer.h"
+#include "utils/threads/async_runner.h"
 
 namespace Json {
 class Value;
@@ -54,7 +60,8 @@ typedef std::vector<uint32_t> DeviceHandles;
 
 class PolicyHandler :
     public utils::Singleton<PolicyHandler, utils::deleters::Deleter<PolicyHandler> >,
-    public PolicyListener {
+    public PolicyListener,
+    public threads::AsyncRunner {
  public:
   virtual ~PolicyHandler();
   bool LoadPolicyLibrary();
@@ -62,15 +69,18 @@ class PolicyHandler :
   bool InitPolicyTable();
   bool ResetPolicyTable();
   bool ClearUserConsent();
-  bool SendMessageToSDK(const BinaryMessage& pt_string);
+  bool SendMessageToSDK(const BinaryMessage& pt_string, const std::string& url);
   bool ReceiveMessageFromSDK(const std::string& file,
                              const BinaryMessage& pt_string);
   bool UnloadPolicyLibrary();
-  void OnPTExchangeNeeded();
   void OnPermissionsUpdated(const std::string& policy_app_id,
                             const Permissions& permissions,
                             const HMILevel& default_hmi);
 
+  virtual void OnSnapshotCreated(const BinaryMessage& pt_string,
+                                 const std::vector<int>& retry_delay_seconds,
+                                 int timeout_exchange);
+
   bool GetPriority(const std::string& policy_app_id, std::string* priority);
   void CheckPermissions(const PTString& app_id,
                    const PTString& hmi_level,
@@ -85,13 +95,14 @@ class PolicyHandler :
   bool GetInitialAppData(const std::string& application_id,
                                  StringArray* nicknames = NULL,
                                  StringArray* app_hmi_types = NULL);
-  EndpointUrls GetUpdateUrls(int service_type);
+  void GetUpdateUrls(int service_type, EndpointUrls& end_points);
   void ResetRetrySequence();
   int NextRetryTimeout();
   int TimeoutExchange();
   void OnExceededTimeout();
-  BinaryMessageSptr RequestPTUpdate();
-  const std::vector<int> RetrySequenceDelaysSeconds();
+  void OnSystemReady();
+  void PTUpdatedAt(int kilometers, int days_after_epoch);
+  void set_listener(PolicyHandlerObserver* listener);
 
   utils::SharedPtr<usage_statistics::StatisticsManager> GetStatisticManager();
 
@@ -147,11 +158,6 @@ class PolicyHandler :
   void OnPendingPermissionChange(const std::string& policy_app_id);
 
   /**
-   * Initializes PT exchange at ignition if need
-   */
-  void PTExchangeAtRegistration(const std::string& app_id);
-
-  /**
    * Initializes PT exchange at user request
    * @param correlation_id correlation id of request
    */
@@ -171,7 +177,7 @@ class PolicyHandler :
    * @param permissions User-changed group permissions consent
    */
   void OnAppPermissionConsent(const uint32_t connection_key,
-                              PermissionConsent& permissions);
+                              const PermissionConsent &permissions);
 
   /**
    * @brief Get appropriate message parameters and send them with response
@@ -204,7 +210,7 @@ class PolicyHandler :
    * @brief Send notification to HMI with changed policy update status
    * @param status Current policy update state
    */
-  void OnUpdateStatusChanged(policy::PolicyTableStatus status);
+  void OnUpdateStatusChanged(const std::string& status);
 
   /**
    * @brief Update currently used device id in policies manager for given
@@ -271,11 +277,15 @@ class PolicyHandler :
 
   std::string GetAppName(const std::string& policy_app_id);
 
-  virtual void OnUserRequestedUpdateCheckRequired();
+  virtual void OnUpdateHMIAppType(std::map<std::string, StringArray> app_hmi_types);
 
   virtual void OnDeviceConsentChanged(const std::string& device_id,
                                       bool is_allowed);
 
+  virtual void OnPTExchangeNeeded();
+
+  virtual void GetAvailableApps(std::queue<std::string>& apps);
+
   /**
    * @brief Allows to add new or update existed application during
    * registration process
@@ -314,7 +324,6 @@ class PolicyHandler :
                    usage_statistics::AppStopwatchId type,
                    int32_t timespan_seconds);
 
-
 protected:
 
   /**
@@ -322,72 +331,62 @@ protected:
    */
   void StartNextRetry();
 
-  /**
-   * Initializes PT exchange at odometer if need
-   * @param kilometers value from odometer in kilometers
-   */
-  void PTExchangeAtOdometer(int kilometers);
-
-  /**
-     * Starts proccess updating policy table
-   */
-    void StartPTExchange(bool skip_device_selection = false);
-
  private:
-  /**
-   * @brief Choose device according to app HMI status and user consent for
-   * device
-   * @param device_info Struct with selected device parameters
-   * @return consent status for selected device
-   */
-  DeviceConsent GetDeviceForSending(DeviceParams& device_params);
 
   /**
-   * @brief Convert internal policy update status to appropriate status for HMI
-   * @param status Internal policy update status
-   * @return Converted status for sending to HMI
+   * @brief OnAppPermissionConsentInternal reacts on permission changing
+   *
+   * @param connection_key connection key
+   *
+   * @param permissions new permissions.
    */
-  const std::string ConvertUpdateStatus(policy::PolicyTableStatus status);
-
+  void OnAppPermissionConsentInternal(const uint32_t connection_key,
+                                      PermissionConsent& permissions);
 private:
-
   class StatisticManagerImpl: public usage_statistics::StatisticsManager {
       //TODO(AKutsan) REMOVE THIS UGLY HOTFIX
         virtual void Increment(usage_statistics::GlobalCounterId type) {
-        return PolicyHandler::instance()->Increment(type);
+
+        PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(type));
       }
 
         virtual void Increment(const std::string& app_id,
                                usage_statistics::AppCounterId type) {
-        return PolicyHandler::instance()->Increment(app_id, type);
+
+        PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(app_id,
+                                                                   type));
       }
 
         virtual void Set(const std::string& app_id,
                          usage_statistics::AppInfoId type,
                          const std::string& value) {
-        return PolicyHandler::instance()->Set(app_id, type, value);
+
+        PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(app_id,
+                                                                   type,
+                                                                   value));
       }
 
         virtual void Add(const std::string& app_id,
                          usage_statistics::AppStopwatchId type,
                          int32_t timespan_seconds) {
-        return PolicyHandler::instance()->Add(app_id, type, timespan_seconds);
+
+        PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(
+                                              app_id, type, timespan_seconds));
       }
   };
   //TODO(AKutsan) REMOVE THIS UGLY HOTFIX
 
 
   PolicyHandler();
+  bool SaveSnapshot(const BinaryMessage& pt_string, std::string& snap_path);
   static PolicyHandler* instance_;
   static const std::string kLibrary;
+  mutable sync_primitives::RWLock policy_manager_lock_;
   utils::SharedPtr<PolicyManager> policy_manager_;
   void* dl_handle_;
   AppIds last_used_app_ids_;
-  utils::SharedPtr<PTExchangeHandler> exchange_handler_;
   utils::SharedPtr<PolicyEventObserver> event_observer_;
-  bool on_ignition_check_done_;
   uint32_t last_activated_app_id_;
-  bool registration_in_progress;
 
   /**
    * @brief Contains device handles, which were sent for user consent to HMI
@@ -396,7 +395,7 @@ private:
 
   inline bool CreateManager();
 
-  bool is_user_requested_policy_table_update_;
+  PolicyHandlerObserver* listener_;
 
   /**
    * @brief Application-to-device map is used for getting/setting user consents
@@ -404,9 +403,12 @@ private:
    */
   std::map<std::string, std::string> app_to_device_link_;
 
+  // Lock for app to device list
+  sync_primitives::Lock app_to_device_link_lock_;
 
   utils::SharedPtr<StatisticManagerImpl> statistic_manager_impl_;
 
+  friend class AppPermissionDelegate;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyHandler);
   FRIEND_BASE_SINGLETON_CLASS_WITH_DELETER(PolicyHandler,
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler_observer.h b/src/components/application_manager/include/application_manager/policies/policy_handler_observer.h
new file mode 100644
index 0000000000..558b2a4b35
--- /dev/null
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler_observer.h
@@ -0,0 +1,45 @@
+/*
+ Copyright (c) 2013, Ford Motor Company
+ 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 Ford Motor Company 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 HOLDER 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.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_HANDLER_OBSERVER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_HANDLER_OBSERVER_H_
+
+namespace policy {
+
+class PolicyHandlerObserver{
+  public:
+  virtual void OnUpdateHMIAppType(std::map<std::string, std::vector<std::string> > app_hmi_types) = 0;
+  virtual ~PolicyHandlerObserver() {}
+};
+}  //  namespace policy
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_HANDLER_OBSERVER_H_
diff --git a/src/components/application_manager/include/application_manager/request_controller.h b/src/components/application_manager/include/application_manager/request_controller.h
index 2bc5f54666..efe6b1c4e8 100644
--- a/src/components/application_manager/include/application_manager/request_controller.h
+++ b/src/components/application_manager/include/application_manager/request_controller.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
@@ -120,7 +120,7 @@ class RequestController {
     * @return Result code
     *
     */
-    TResult addMobileRequest(const MobileRequestPtr& request,
+    TResult addMobileRequest(const RequestPtr request,
                              const mobile_apis::HMILevel::eType& hmi_level);
 
 
@@ -146,7 +146,7 @@ class RequestController {
     * @param mobile_corellation_id Active mobile request correlation ID
     *
     */
-    void terminateMobileRequest(const uint32_t& mobile_correlation_id);
+    void terminateMobileRequest(const uint32_t& mobile_correlation_id, const uint32_t& connection_key);
 
 
     /**
@@ -177,6 +177,12 @@ class RequestController {
     */
     void terminateAllHMIRequests();
 
+
+    /**
+    * @brief Terminates all requests from Mobile
+    */
+    void terminateAllMobileRequests();
+
     /**
     * @brief Updates request timeout
     *
@@ -188,30 +194,50 @@ class RequestController {
                               const uint32_t& mobile_correlation_id,
                               const uint32_t& new_timeout);
 
+    /*
+     * @brief Function Should be called when Low Voltage is occured
+     */
+    void OnLowVoltage();
+
+    /*
+     * @brief Function Should be called when Low Voltage is occured
+     */
+    void OnWakeUp();
+
+    bool IsLowVoltage();
   protected:
 
     /**
-     * @brief Checs if this app as able to add new requests, or limits was exceeded
+     * @brief Check if this app is able to add new requests, or limits was exceeded
      * @param app_id - application id
      * @param app_time_scale - time scale (seconds)
-     * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale secconds
+     * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale seconds
+     * @return True if new request could be added, false otherwise
      */
-    bool checkTimeScaleMaxRequest(const uint32_t& app_id,
+    bool CheckTimeScaleMaxRequest(const uint32_t& app_id,
                                   const uint32_t& app_time_scale,
                                   const uint32_t& max_request_per_time_scale);
 
     /**
-     * @brief Checs if this app as able to add new requests in current hmi_level, or limits was exceeded
+     * @brief Check if this app is able to add new requests in current hmi_level, or limits was exceeded
      * @param hmi_level - hmi level
      * @param app_id - application id
      * @param app_time_scale - time scale (seconds)
-     * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale secconds
+     * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale seconds
+     * @return True if new request could be added, false otherwise
      */
-    bool checkHMILevelTimeScaleMaxRequest(const mobile_apis::HMILevel::eType& hmi_level,
+    bool CheckHMILevelTimeScaleMaxRequest(const mobile_apis::HMILevel::eType& hmi_level,
                                           const uint32_t& app_id,
                                           const uint32_t& app_time_scale,
                                           const uint32_t& max_request_per_time_scale);
 
+    /**
+     * @brief Check Posibility to add new requests, or limits was exceeded
+     * @param pending_requests_amount - maximum count of request that should be allowed for all applications
+     * @return True if new request could be added, false otherwise
+     */
+    bool CheckPendingRequestsAmount(const uint32_t& pending_requests_amount);
+
     void onTimer();
 
     /**
@@ -220,6 +246,7 @@ class RequestController {
     */
     void UpdateTimer();
 
+
   private:
 
     // Data types
@@ -229,7 +256,7 @@ class RequestController {
         Worker(RequestController* requestController);
         virtual ~Worker();
         virtual void threadMain();
-        virtual bool exitThreadMain();
+        virtual void exitThreadMain();
       protected:
       private:
         RequestController*                               request_controller_;
@@ -242,7 +269,7 @@ class RequestController {
     uint32_t pool_size_;
     sync_primitives::ConditionalVariable cond_var_;
 
-    std::list<MobileRequestPtr> mobile_request_list_;
+    std::list<RequestPtr> mobile_request_list_;
     sync_primitives::Lock mobile_request_list_lock_;
 
     RequestInfoSet pending_request_set_;
@@ -256,6 +283,7 @@ class RequestController {
     timer::TimerThread<RequestController>  timer_;
     static const uint32_t dafault_sleep_time_ = UINT_MAX;
 
+    bool is_low_voltage_;
     DISALLOW_COPY_AND_ASSIGN(RequestController);
 };
 
diff --git a/src/components/application_manager/include/application_manager/request_info.h b/src/components/application_manager/include/application_manager/request_info.h
index b1409488fd..13efe07a76 100644
--- a/src/components/application_manager/include/application_manager/request_info.h
+++ b/src/components/application_manager/include/application_manager/request_info.h
@@ -1,34 +1,34 @@
-/**
-* \file request_info.h
-* \brief request information structure header file.
-*
-* Copyright (c) 2014, Ford Motor Company
-* 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 Ford Motor Company 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 HOLDER 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)
+/*
+ * \file request_info.h
+ * \brief request information structure header file.
+ *
+ * Copyright (c) 2014, Ford Motor Company
+ * 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 Ford Motor Company 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 HOLDER 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.
 */
@@ -52,19 +52,21 @@ namespace request_controller {
    *
    */
   typedef utils::SharedPtr<commands::Command> RequestPtr;
-  typedef utils::SharedPtr<commands::CommandRequestImpl> MobileRequestPtr;
 
   struct RequestInfo {
-    RequestInfo(const uint64_t timeout_sec)
+    enum RequestType {MobileRequest, HMIRequest};
+    RequestInfo(const RequestType requst_type, const uint64_t timeout_sec)
       : timeout_sec_(timeout_sec) {
         start_time_ = date_time::DateTime::getCurrentTime();
         updateEndTime();
+        requst_type_ = requst_type;
       }
 
-    RequestInfo(const TimevalStruct& start_time,const  uint64_t timeout_sec)
+    RequestInfo(const RequestType requst_type, const TimevalStruct& start_time,const  uint64_t timeout_sec)
       : start_time_(start_time),
         timeout_sec_(timeout_sec) {
         updateEndTime();
+        requst_type_ = requst_type;
     }
 
     virtual ~RequestInfo(){}
@@ -87,8 +89,8 @@ namespace request_controller {
     }
 
     bool isExpired() {
-      if ( date_time::GREATER ==
-           date_time::DateTime::compareTime(end_time_, date_time::DateTime::getCurrentTime()) ) {
+      if (date_time::GREATER ==
+           date_time::DateTime::compareTime(end_time_, date_time::DateTime::getCurrentTime())) {
         return false;
       }
       return true;
@@ -113,6 +115,9 @@ namespace request_controller {
     mobile_apis::HMILevel::eType hmi_level() {
       return hmi_level_;
     }
+    RequestType requst_type() const {
+       return requst_type_;
+     }
 
   protected:
     TimevalStruct                 start_time_;
@@ -120,6 +125,7 @@ namespace request_controller {
     TimevalStruct                 end_time_;
     uint32_t                      app_id_;
     mobile_apis::HMILevel::eType  hmi_level_;
+    RequestType                   requst_type_;
   };
 
   typedef utils::SharedPtr<RequestInfo> RequestInfoPtr;
diff --git a/src/components/application_manager/include/application_manager/resume_ctrl.h b/src/components/application_manager/include/application_manager/resume_ctrl.h
index 463df0b867..9d03fb0577 100644
--- a/src/components/application_manager/include/application_manager/resume_ctrl.h
+++ b/src/components/application_manager/include/application_manager/resume_ctrl.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -137,6 +137,7 @@ class ResumeCtrl: public event_engine::EventObserver {
      */
     void IgnitionOff();
 
+
     /**
      * @brief Start timer for resumption applications
      *        Restore D1-D5 data
@@ -192,13 +193,27 @@ class ResumeCtrl: public event_engine::EventObserver {
     uint32_t GetHMIApplicationID(const std::string& mobile_app_id);
 
     /**
-     * @brief Timer callback function
+     * @brief Timer callback for  restoring HMI Level
      *
      */
-    void onTimer();
+    void ApplicationResumptiOnTimer();
+
+
+    /**
+     * @brief SaveDataOnTimer :
+     *  Timer callback for persisting ResumptionData each N seconds
+     *  N gets from property
+     */
+    void SaveDataOnTimer();
 
     void ClearResumptionInfo();
 
+    void ApplicationsDataUpdated() {
+      is_data_saved = false;
+    }
+
+    void RestoreHmiLevel(uint32_t time_stamp, ApplicationSharedPtr application);
+
   private:
 
     typedef std::pair<uint32_t, uint32_t> application_timestamp;
@@ -260,10 +275,115 @@ class ResumeCtrl: public event_engine::EventObserver {
         NsSmartDeviceLink::NsSmartObjects::SmartObject* request = NULL,
         bool use_events = false);
 
+    void InsertToTimerQueue(uint32_t app_id, uint32_t time_stamp);
+
+    /**
+     * @brief AddFiles allows to add files for the application
+     * which should be resumed
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddFiles(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief AddSubmenues allows to add sub menues for the application
+     * which should be resumed
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddSubmenues(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief AddCommands allows to add commands for the application
+     * which should be resumed
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddCommands(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief AddChoicesets allows to add choice sets for the application
+     * which should be resumed
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddChoicesets(ApplicationSharedPtr application, const Json::Value& saved_app);
+
     /**
-     * @brief Time step to check resumption TIME_OUT
+     * @brief SetGlobalProperties allows to restore global properties.
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void SetGlobalProperties(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief AddSubscriptions allows to restore subscriptions
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddSubscriptions(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief ProcessHMIRequests allows to process obtained requests.
+     *
+     * @param requests request that should be processed.
+     */
+    void ProcessHMIRequests(const std::vector<smart_objects::SmartObject*> & requests);
+
+    /**
+     * @brief CheckIcons allows to check application icons
+     *
+     * @param application application under resumtion  application
+     *
+     * @param json_object
+     *
+     * @return true in case icons exists, false otherwise
+     */
+    bool CheckIcons(ApplicationSharedPtr application, const Json::Value& json_object);
+
+    /**
+     * @brief GetFromSavedOrAppend allows to get existed record about application
+     * or adds the new one.
+     *
+     * @param mobile_app_id application id.
+     *
+     * @return the reference to the record in applications array.
      */
-    static const uint32_t kTimeStep = 3;
+    Json::Value& GetFromSavedOrAppend(const std::string& mobile_app_id);
+
+    /**
+     * @brief GetObjectIndex allows to obtain specified obbject index from
+     * applications arrays.
+     *
+     * @param mobile_app_id application id that should be found.
+     *
+     * @return application's index of or -1 if it doesn't exists
+     */
+    int GetObjectIndex(const std::string& mobile_app_id);
+
+    template<typename Iterator>
+    Json::Value Append(Iterator first,
+                       Iterator last,
+                       const std::string& key,
+                       Json::Value& result) {
+      while (first != last) {
+        result[key].append(*first);
+        ++first;
+      }
+      return result;
+    }
 
     /**
      *  @brief times of IGN_OFF that zombie application have to be saved.
@@ -278,7 +398,10 @@ class ResumeCtrl: public event_engine::EventObserver {
     std::multiset<application_timestamp, TimeStampComparator> waiting_for_timer_;
     mutable sync_primitives::Lock   queue_lock_;
     ApplicationManagerImpl*         app_mngr_;
-    timer::TimerThread<ResumeCtrl>  timer_;
+    timer::TimerThread<ResumeCtrl>  restore_hmi_level_timer_;
+    timer::TimerThread<ResumeCtrl>  save_persistent_data_timer_;
+    bool is_data_saved;
+
 };
 
 }  // namespace application_manager
diff --git a/src/components/application_manager/include/application_manager/time_metric_observer.h b/src/components/application_manager/include/application_manager/time_metric_observer.h
index 780401f6f3..de3deb8372 100644
--- a/src/components/application_manager/include/application_manager/time_metric_observer.h
+++ b/src/components/application_manager/include/application_manager/time_metric_observer.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/include/application_manager/usage_statistics.h b/src/components/application_manager/include/application_manager/usage_statistics.h
index dcd57aee34..d6ff1f2c49 100644
--- a/src/components/application_manager/include/application_manager/usage_statistics.h
+++ b/src/components/application_manager/include/application_manager/usage_statistics.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/src/application_data_impl.cc b/src/components/application_manager/src/application_data_impl.cc
index 56fc88ffe3..e5fb6d4eab 100644
--- a/src/components/application_manager/src/application_data_impl.cc
+++ b/src/components/application_manager/src/application_data_impl.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -32,8 +32,10 @@
 
 #include "application_manager/application_data_impl.h"
 #include "application_manager/smart_object_keys.h"
+#include "utils/logger.h"
 
 namespace application_manager {
+CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationDataImpl")
 
 InitialApplicationDataImpl::InitialApplicationDataImpl()
     : app_types_(NULL),
@@ -277,6 +279,30 @@ const NsSmartDeviceLink::NsSmartObjects::SmartObject* DynamicApplicationDataImpl
   return menu_icon_;
 }
 
+void DynamicApplicationDataImpl::load_global_properties(
+    const smart_objects::SmartObject& properties_so) {
+  SetGlobalProperties(properties_so.getElement(strings::vr_help_title),
+                       &DynamicApplicationData::set_vr_help_title);
+
+  SetGlobalProperties(properties_so.getElement(strings::vr_help),
+                       &DynamicApplicationData::set_vr_help);
+
+  SetGlobalProperties(properties_so.getElement(strings::timeout_prompt),
+                      &DynamicApplicationData::set_timeout_prompt);
+
+  SetGlobalProperties(properties_so.getElement(strings::help_prompt),
+                      &DynamicApplicationData::set_help_prompt);
+
+  SetGlobalProperties(properties_so.getElement(strings::keyboard_properties),
+                      &DynamicApplicationData::set_keyboard_props);
+
+  SetGlobalProperties(properties_so.getElement(strings::menu_title),
+                      &DynamicApplicationData::set_menu_title);
+
+  SetGlobalProperties(properties_so.getElement(strings::menu_icon),
+                      &DynamicApplicationData::set_menu_icon);
+}
+
 void DynamicApplicationDataImpl::set_help_prompt(
     const smart_objects::SmartObject& help_prompt) {
   if (help_prompt_) {
@@ -368,15 +394,31 @@ void DynamicApplicationDataImpl::set_menu_icon(
   menu_icon_= new smart_objects::SmartObject(menu_icon);
 }
 
+void DynamicApplicationDataImpl::SetGlobalProperties(
+    const smart_objects::SmartObject& param,
+    void (DynamicApplicationData::*callback)(
+      const NsSmartDeviceLink::NsSmartObjects::SmartObject&)) {
+
+  smart_objects::SmartType so_type = param.getType();
+  if (so_type != smart_objects::SmartType::SmartType_Invalid  &&
+      so_type != smart_objects::SmartType::SmartType_Null) {
+    if (callback) {
+      (this->*callback)(param);
+    }
+  } else {
+    LOG4CXX_WARN(logger_, "Invalid or Null smart object");
+  }
+}
 
 void DynamicApplicationDataImpl::AddCommand(
   uint32_t cmd_id, const smart_objects::SmartObject& command) {
+  sync_primitives::AutoLock lock(commands_lock_);
   commands_[cmd_id] = new smart_objects::SmartObject(command);
 }
 
 void DynamicApplicationDataImpl::RemoveCommand(uint32_t cmd_id) {
+  sync_primitives::AutoLock lock(commands_lock_);
   CommandsMap::iterator it = commands_.find(cmd_id);
-
   if (commands_.end() != it) {
     delete it->second;
     commands_.erase(it);
@@ -385,6 +427,7 @@ void DynamicApplicationDataImpl::RemoveCommand(uint32_t cmd_id) {
 
 smart_objects::SmartObject* DynamicApplicationDataImpl::FindCommand(
     uint32_t cmd_id) {
+  sync_primitives::AutoLock lock(commands_lock_);
   CommandsMap::const_iterator it = commands_.find(cmd_id);
   if (it != commands_.end()) {
     return it->second;
@@ -396,10 +439,12 @@ smart_objects::SmartObject* DynamicApplicationDataImpl::FindCommand(
 // TODO(VS): Create common functions for processing collections
 void DynamicApplicationDataImpl::AddSubMenu(
   uint32_t menu_id, const smart_objects::SmartObject& menu) {
+  sync_primitives::AutoLock lock(sub_menu_lock_);
   sub_menu_[menu_id] = new smart_objects::SmartObject(menu);
 }
 
 void DynamicApplicationDataImpl::RemoveSubMenu(uint32_t menu_id) {
+  sync_primitives::AutoLock lock(sub_menu_lock_);
   SubMenuMap::iterator it = sub_menu_.find(menu_id);
 
   if (sub_menu_.end() != it) {
@@ -410,6 +455,7 @@ void DynamicApplicationDataImpl::RemoveSubMenu(uint32_t menu_id) {
 
 smart_objects::SmartObject* DynamicApplicationDataImpl::FindSubMenu(
     uint32_t menu_id) const {
+  sync_primitives::AutoLock lock(sub_menu_lock_);
   SubMenuMap::const_iterator it = sub_menu_.find(menu_id);
   if (it != sub_menu_.end()) {
     return it->second;
@@ -420,6 +466,7 @@ smart_objects::SmartObject* DynamicApplicationDataImpl::FindSubMenu(
 
 bool DynamicApplicationDataImpl::IsSubMenuNameAlreadyExist(
     const std::string& name) {
+  sync_primitives::AutoLock lock(sub_menu_lock_);
   for (SubMenuMap::iterator it = sub_menu_.begin();
        sub_menu_.end() != it;
        ++it) {
@@ -433,10 +480,12 @@ bool DynamicApplicationDataImpl::IsSubMenuNameAlreadyExist(
 
 void DynamicApplicationDataImpl::AddChoiceSet(
   uint32_t choice_set_id, const smart_objects::SmartObject& choice_set) {
+  sync_primitives::AutoLock lock(choice_set_map_lock_);
   choice_set_map_[choice_set_id] = new smart_objects::SmartObject(choice_set);
 }
 
 void DynamicApplicationDataImpl::RemoveChoiceSet(uint32_t choice_set_id) {
+  sync_primitives::AutoLock lock(choice_set_map_lock_);
   ChoiceSetMap::iterator it = choice_set_map_.find(choice_set_id);
 
   if (choice_set_map_.end() != it) {
@@ -447,6 +496,7 @@ void DynamicApplicationDataImpl::RemoveChoiceSet(uint32_t choice_set_id) {
 
 smart_objects::SmartObject* DynamicApplicationDataImpl::FindChoiceSet(
     uint32_t choice_set_id) {
+  sync_primitives::AutoLock lock(choice_set_map_lock_);
   ChoiceSetMap::const_iterator it = choice_set_map_.find(choice_set_id);
   if (it != choice_set_map_.end()) {
     return it->second;
@@ -457,11 +507,13 @@ smart_objects::SmartObject* DynamicApplicationDataImpl::FindChoiceSet(
 
 void DynamicApplicationDataImpl::AddPerformInteractionChoiceSet(
   uint32_t choice_set_id, const smart_objects::SmartObject& vr_commands) {
+  sync_primitives::AutoLock lock(performinteraction_choice_set_lock_);
   performinteraction_choice_set_map_[choice_set_id] =
       new smart_objects::SmartObject(vr_commands);
 }
 
 void DynamicApplicationDataImpl::DeletePerformInteractionChoiceSetMap() {
+  sync_primitives::AutoLock lock(performinteraction_choice_set_lock_);
   PerformChoiceSetMap::iterator it = performinteraction_choice_set_map_.begin();
   for (; performinteraction_choice_set_map_.end() != it; ++it) {
     delete it->second;
@@ -472,6 +524,7 @@ void DynamicApplicationDataImpl::DeletePerformInteractionChoiceSetMap() {
 smart_objects::SmartObject*
 DynamicApplicationDataImpl::FindPerformInteractionChoiceSet(
   uint32_t choice_set_id) const {
+  sync_primitives::AutoLock lock(performinteraction_choice_set_lock_);
   PerformChoiceSetMap::const_iterator it = performinteraction_choice_set_map_
       .find(choice_set_id);
 
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index f52467f751..c4eb7347cb 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include "application_manager/application_impl.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/application_manager_impl.h"
 #include "config_profile/profile.h"
 #include "interfaces/MOBILE_API.h"
 #include "utils/file_system.h"
@@ -148,7 +149,7 @@ bool ApplicationImpl::IsFullscreen() const {
 }
 
 bool ApplicationImpl::MakeFullscreen() {
-  hmi_level_ = mobile_api::HMILevel::HMI_FULL;
+  set_hmi_level(mobile_api::HMILevel::HMI_FULL);
   if (is_media_ && !tts_speak_state_) {
     audio_streaming_state_ = mobile_api::AudioStreamingState::AUDIBLE;
   }
@@ -158,6 +159,25 @@ bool ApplicationImpl::MakeFullscreen() {
   }
   return true;
 }
+void ApplicationImpl::ChangeSupportingAppHMIType() {
+  allowed_support_navigation_ = false;
+  is_voice_communication_application_ = false;
+  const smart_objects::SmartObject& array_app_types = *app_types_;
+  uint32_t lenght_app_types = array_app_types.length();
+
+  for (uint32_t i = 0; i < lenght_app_types; ++i) {
+    if (mobile_apis::AppHMIType::NAVIGATION ==
+        static_cast<mobile_apis::AppHMIType::eType>(
+            array_app_types[i].asUInt())) {
+      allowed_support_navigation_ = true;
+    }
+    if (mobile_apis::AppHMIType::COMMUNICATION ==
+        static_cast<mobile_apis::AppHMIType::eType>(
+            array_app_types[i].asUInt())) {
+      is_voice_communication_application_ = true;
+    }
+  }
+}
 
 bool ApplicationImpl::IsAudible() const {
   return mobile_api::HMILevel::HMI_FULL == hmi_level_
@@ -165,7 +185,7 @@ bool ApplicationImpl::IsAudible() const {
 }
 
 void ApplicationImpl::MakeNotAudible() {
-  hmi_level_ = mobile_api::HMILevel::HMI_BACKGROUND;
+  set_hmi_level(mobile_api::HMILevel::HMI_BACKGROUND);
   audio_streaming_state_ = mobile_api::AudioStreamingState::NOT_AUDIBLE;
 }
 
@@ -295,7 +315,7 @@ void ApplicationImpl::set_hmi_level(
     delete_file_in_none_count_ = 0;
     list_files_in_none_count_ = 0;
   }
-
+  LOG4CXX_INFO(logger_, "hmi_level = " << hmi_level);
   hmi_level_ = hmi_level;
   usage_report_.RecordHmiStateChanged(hmi_level);
 }
@@ -372,7 +392,7 @@ void ApplicationImpl::OnVideoStreamRetry() {
     video_stream_retry_timer_->updateTimeOut(time_out);
   } else {
     LOG4CXX_INFO(logger_, "Stop video streaming retry");
-    video_stream_retry_timer_.release();
+    video_stream_retry_timer_->stop();
     set_video_stream_retry_active(false);
   }
 }
@@ -391,7 +411,7 @@ void ApplicationImpl::OnAudioStreamRetry() {
     audio_stream_retry_timer_->updateTimeOut(time_out);
   } else {
     LOG4CXX_INFO(logger_, "Stop audio streaming retry");
-    audio_stream_retry_timer_.release();
+    audio_stream_retry_timer_->stop();
     set_audio_stream_retry_active(false);
   }
 }
@@ -656,6 +676,7 @@ uint32_t ApplicationImpl::curHash() const {
 }
 
 uint32_t ApplicationImpl::UpdateHash() {
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t new_hash= nextHash();
   MessageHelper::SendHashUpdateNotification(app_id());
   return new_hash;
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 6d7fdeec61..e085855568 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -55,6 +55,12 @@
 #include "usage_statistics/counter.h"
 #include <time.h>
 
+namespace {
+  int get_rand_from_range(uint32_t from = 0, int to = RAND_MAX) {
+    return std::rand() % to + from;
+  }
+}
+
 namespace application_manager {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager")
@@ -83,6 +89,7 @@ ApplicationManagerImpl::ApplicationManagerImpl()
     messages_to_mobile_("AM ToMobile", this),
     messages_from_hmi_("AM FromHMI", this),
     messages_to_hmi_("AM ToHMI", this),
+    audio_pass_thru_messages_("AudioPassThru", this),
     hmi_capabilities_(this),
     unregister_reason_(mobile_api::AppInterfaceUnregisteredReason::IGNITION_OFF),
     resume_ctrl_(this),
@@ -93,8 +100,10 @@ ApplicationManagerImpl::ApplicationManagerImpl()
     tts_global_properties_timer_("TTSGLPRTimer",
                                       this,
                                       &ApplicationManagerImpl::OnTimerSendTTSGlobalProperties,
-                                      true) {
+                                      true),
+    is_low_voltage_(false) {
     std::srand(std::time(0));
+    policy::PolicyHandler::instance()->set_listener(this);
 }
 
 ApplicationManagerImpl::~ApplicationManagerImpl() {
@@ -104,14 +113,14 @@ ApplicationManagerImpl::~ApplicationManagerImpl() {
   media_manager_ = NULL;
   hmi_handler_ = NULL;
   connection_handler_ = NULL;
-  if (hmi_so_factory_) {
+  if(hmi_so_factory_) {
     delete hmi_so_factory_;
+    hmi_so_factory_ = NULL;
   }
-  hmi_so_factory_ = NULL;
-  if (mobile_so_factory_) {
+  if(mobile_so_factory_) {
     delete mobile_so_factory_;
+    mobile_so_factory_ = NULL;
   }
-  mobile_so_factory_ = NULL;
   protocol_handler_ = NULL;
   media_manager_ = NULL;
   LOG4CXX_INFO(logger_, "Destroying Policy Handler");
@@ -475,9 +484,9 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication(
     }
   }
 
-  sync_primitives::AutoLock lock(applications_list_lock_);
-
+  applications_list_lock_.Acquire();
   application_list_.insert(application);
+  applications_list_lock_.Release();
 
   return application;
 }
@@ -491,6 +500,7 @@ bool ApplicationManagerImpl::LoadAppDataToHMI(ApplicationSharedPtr app) {
 }
 
 bool ApplicationManagerImpl::ActivateApplication(ApplicationSharedPtr app) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!app) {
     LOG4CXX_ERROR(logger_, "Null-pointer application received.");
     NOTREACHED();
@@ -562,8 +572,12 @@ bool ApplicationManagerImpl::ActivateApplication(ApplicationSharedPtr app) {
 
 mobile_api::HMILevel::eType ApplicationManagerImpl::PutApplicationInFull(
   ApplicationSharedPtr app) {
-  DCHECK(app.get())
-
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!app) {
+    LOG4CXX_ERROR(logger_, "Application pointer invalid");
+    NOTREACHED();
+    return mobile_api::HMILevel::INVALID_ENUM;
+  }
   bool is_audio_app = app->IsAudioApplication();
   bool does_audio_app_with_same_type_exist =
       DoesAudioAppWithSameHMITypeExistInFullOrLimited(app);
@@ -581,7 +595,6 @@ mobile_api::HMILevel::eType ApplicationManagerImpl::PutApplicationInFull(
   }
 
   if (mobile_api::HMILevel::HMI_FULL == result) {
-    app->set_hmi_level(result);
     MessageHelper::SendActivateAppToHMI(app->app_id());
   }
   return result;
@@ -691,50 +704,23 @@ void ApplicationManagerImpl::StartAudioPassThruThread(int32_t session_key,
 
 void ApplicationManagerImpl::SendAudioPassThroughNotification(
   uint32_t session_key,
-  std::vector<uint8_t> binaryData) {
-  LOG4CXX_TRACE_ENTER(logger_);
+  std::vector<uint8_t>& binary_data) {
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if (!audio_pass_thru_active_) {
     LOG4CXX_ERROR(logger_, "Trying to send PassThroughNotification"
                   " when PassThrough is not active");
     return;
   }
-  smart_objects::SmartObject* on_audio_pass = NULL;
-  on_audio_pass = new smart_objects::SmartObject();
-
-  if (NULL == on_audio_pass) {
-    LOG4CXX_ERROR_EXT(logger_, "OnAudioPassThru NULL pointer");
-
-    return;
-  }
-
-  LOG4CXX_INFO_EXT(logger_, "Fill smart object");
 
-  (*on_audio_pass)[strings::params][strings::message_type] =
-    application_manager::MessageType::kNotification;
-
-  (*on_audio_pass)[strings::params][strings::connection_key] =
-    static_cast<int32_t>(session_key);
-  (*on_audio_pass)[strings::params][strings::function_id] =
-    mobile_apis::FunctionID::OnAudioPassThruID;
-
-  LOG4CXX_INFO_EXT(logger_, "Fill binary data");
-  // binary data
-  (*on_audio_pass)[strings::params][strings::binary_data] =
-    smart_objects::SmartObject(binaryData);
-
-  LOG4CXX_INFO_EXT(logger_, "After fill binary data");
-
-  LOG4CXX_INFO_EXT(logger_, "Send data");
-  CommandSharedPtr command (
-    MobileCommandFactory::CreateCommand(&(*on_audio_pass)));
-  command->Init();
-  command->Run();
-  command->CleanUp();
+  impl::AudioData data;
+  data.session_key = session_key;
+  data.binary_data = binary_data;
+  audio_pass_thru_messages_.PostMessage(data);
 }
 
 void ApplicationManagerImpl::StopAudioPassThru(int32_t application_key) {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(audio_pass_thru_lock_);
   if (NULL != media_manager_) {
     media_manager_->StopMicrophoneRecording(application_key);
@@ -761,7 +747,7 @@ std::string ApplicationManagerImpl::GetDeviceName(
 
 void ApplicationManagerImpl::OnMessageReceived(
   const ::protocol_handler::RawMessagePtr message) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::OnMessageReceived");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if (!message) {
     LOG4CXX_ERROR(logger_, "Null-pointer message received.");
@@ -779,12 +765,12 @@ void ApplicationManagerImpl::OnMessageReceived(
 
 void ApplicationManagerImpl::OnMobileMessageSent(
   const ::protocol_handler::RawMessagePtr message) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::OnMobileMessageSent");
+  LOG4CXX_AUTO_TRACE(logger_);
 }
 
 void ApplicationManagerImpl::OnMessageReceived(
   hmi_message_handler::MessageSharedPointer message) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::OnMessageReceived");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if (!message) {
     LOG4CXX_ERROR(logger_, "Null-pointer message received.");
@@ -802,7 +788,7 @@ void ApplicationManagerImpl::OnErrorSending(
 
 void ApplicationManagerImpl::OnDeviceListUpdated(
     const connection_handler::DeviceMap& device_list) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::OnDeviceListUpdated");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   smart_objects::SmartObject* update_list = new smart_objects::SmartObject;
   smart_objects::SmartObject& so_to_send = *update_list;
@@ -813,7 +799,7 @@ void ApplicationManagerImpl::OnDeviceListUpdated(
   so_to_send[jhs::S_PARAMS][jhs::S_PROTOCOL_VERSION] = 3;
   so_to_send[jhs::S_PARAMS][jhs::S_PROTOCOL_TYPE] = 1;
   so_to_send[jhs::S_PARAMS][jhs::S_CORRELATION_ID] = GetNextHMICorrelationID();
-  smart_objects::SmartObject* msg_params = MessageHelper::CreateDeviceListSO(
+  utils::SharedPtr<smart_objects::SmartObject> msg_params = MessageHelper::CreateDeviceListSO(
         device_list);
   if (!msg_params) {
     LOG4CXX_WARN(logger_, "Failed to create sub-smart object.");
@@ -913,12 +899,17 @@ uint32_t ApplicationManagerImpl::GenerateGrammarID() {
 }
 
 uint32_t ApplicationManagerImpl::GenerateNewHMIAppID() {
-  uint32_t hmi_app_id = rand();
+  LOG4CXX_TRACE(logger_, "ENTER");
+  uint32_t hmi_app_id = get_rand_from_range(1);
+  LOG4CXX_DEBUG(logger_, "GenerateNewHMIAppID value is: " << hmi_app_id);
 
   while (resume_ctrl_.IsHMIApplicationIdExist(hmi_app_id)) {
-    hmi_app_id = rand();
+    LOG4CXX_DEBUG(logger_, "HMI appID " << hmi_app_id << " is exists.");
+    hmi_app_id = get_rand_from_range(1);
+    LOG4CXX_DEBUG(logger_, "Trying new value: " << hmi_app_id);
   }
 
+  LOG4CXX_TRACE(logger_, "EXIT");
   return hmi_app_id;
 }
 
@@ -1088,6 +1079,21 @@ void ApplicationManagerImpl::OnServiceEndedCallback(const int32_t& session_key,
   }
 }
 
+void ApplicationManagerImpl::OnApplicationFloodCallBack(const uint32_t &connection_key) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  LOG4CXX_DEBUG(logger_, "Unregister flooding application " << connection_key);
+
+  MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile(
+      connection_key,
+      mobile_apis::AppInterfaceUnregisteredReason::TOO_MANY_REQUESTS);
+
+  const bool resuming = true;
+  const bool unexpected_disconnect = false;
+  UnregisterApplication(connection_key, mobile_apis::Result::TOO_MANY_PENDING_REQUESTS,
+                        resuming, unexpected_disconnect);
+  // TODO(EZamakhov): increment "removals_for_bad_behaviour" field in policy table
+}
+
 void ApplicationManagerImpl::set_hmi_message_handler(
   hmi_message_handler::HMIMessageHandler* handler) {
   hmi_handler_ = handler;
@@ -1115,7 +1121,7 @@ void ApplicationManagerImpl::StartDevicesDiscovery() {
 void ApplicationManagerImpl::SendMessageToMobile(
   const utils::SharedPtr<smart_objects::SmartObject> message,
   bool final_message) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::SendMessageToMobile");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if (!message) {
     LOG4CXX_ERROR(logger_, "Null-pointer message received.");
@@ -1166,7 +1172,8 @@ void ApplicationManagerImpl::SendMessageToMobile(
   // checked against policy permissions
   if (msg_to_mobile[strings::params].keyExists(strings::correlation_id)) {
     request_ctrl_.terminateMobileRequest(
-      msg_to_mobile[strings::params][strings::correlation_id].asInt());
+      msg_to_mobile[strings::params][strings::correlation_id].asInt(),
+      msg_to_mobile[strings::params][strings::connection_key].asInt());
   } else if (app) {
     mobile_apis::FunctionID::eType function_id =
         static_cast<mobile_apis::FunctionID::eType>(
@@ -1179,7 +1186,10 @@ void ApplicationManagerImpl::SendMessageToMobile(
       smart_objects::SmartMap::iterator iter_end = s_map.map_end();
 
       for (; iter != iter_end; ++iter) {
-        params.push_back(iter->first);
+        if (true == iter->second.asBool()) {
+          LOG4CXX_INFO(logger_, "Request's param: " << iter->first);
+          params.push_back(iter->first);
+        }
       }
     }
     const mobile_apis::Result::eType check_result =
@@ -1204,14 +1214,17 @@ void ApplicationManagerImpl::SendMessageToMobile(
 
 bool ApplicationManagerImpl::ManageMobileCommand(
   const utils::SharedPtr<smart_objects::SmartObject> message) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::ManageMobileCommand");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if (!message) {
     LOG4CXX_WARN(logger_, "RET Null-pointer message received.");
-    NOTREACHED()
     return false;
   }
 
+  if (IsLowVoltage()) {
+    LOG4CXX_WARN(logger_, "Low Voltage is active");
+    return false;
+  }
 #ifdef DEBUG
   MessageHelper::PrintSmartObject(*message);
 #endif
@@ -1275,13 +1288,11 @@ bool ApplicationManagerImpl::ManageMobileCommand(
   }
   if (message_type ==
       mobile_apis::messageType::notification) {
-    commands::CommandNotificationImpl* command_notify =
-        static_cast<commands::CommandNotificationImpl*>(command);
-    request_ctrl_.addNotification(command_notify);
-    if (command_notify->Init()) {
-      command_notify->Run();
-      if (command_notify->CleanUp()) {
-        request_ctrl_.removeNotification(command_notify);
+    request_ctrl_.addNotification(command);
+    if (command->Init()) {
+      command->Run();
+      if (command->CleanUp()) {
+        request_ctrl_.removeNotification(command);
       }
       // If CleanUp returned false notification should remove it self.
     }
@@ -1291,8 +1302,6 @@ bool ApplicationManagerImpl::ManageMobileCommand(
   if (message_type ==
       mobile_apis::messageType::request) {
 
-    commands::CommandRequestImpl* command_request =
-        static_cast<commands::CommandRequestImpl*>(command);
     // commands will be launched from requesr_ctrl
     mobile_apis::HMILevel::eType app_hmi_level = mobile_apis::HMILevel::INVALID_ENUM;
     if (app) {
@@ -1301,8 +1310,8 @@ bool ApplicationManagerImpl::ManageMobileCommand(
 
     // commands will be launched from request_ctrl
 
-    request_controller::RequestController::TResult result =
-      request_ctrl_.addMobileRequest(command_request, app_hmi_level);
+    const request_controller::RequestController::TResult result =
+      request_ctrl_.addMobileRequest(command, app_hmi_level);
 
     if (result == request_controller::RequestController::SUCCESS) {
       LOG4CXX_INFO(logger_, "Perform request");
@@ -1344,7 +1353,10 @@ bool ApplicationManagerImpl::ManageMobileCommand(
         connection_key, mobile_api::AppInterfaceUnregisteredReason::
         REQUEST_WHILE_IN_NONE_HMI_LEVEL);
 
-      application(connection_key)->usage_report().RecordRemovalsForBadBehavior();
+      ApplicationSharedPtr app_ptr = application(connection_key);
+      if(app_ptr) {
+        app_ptr->usage_report().RecordRemovalsForBadBehavior();
+      }
       UnregisterApplication(connection_key, mobile_apis::Result::INVALID_ENUM,
                             false);
       return false;
@@ -1361,7 +1373,7 @@ bool ApplicationManagerImpl::ManageMobileCommand(
 
 void ApplicationManagerImpl::SendMessageToHMI(
   const utils::SharedPtr<smart_objects::SmartObject> message) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::SendMessageToHMI");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if (!message) {
     LOG4CXX_WARN(logger_, "Null-pointer message received.");
@@ -1403,14 +1415,17 @@ void ApplicationManagerImpl::SendMessageToHMI(
 
 bool ApplicationManagerImpl::ManageHMICommand(
   const utils::SharedPtr<smart_objects::SmartObject> message) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::ManageHMICommand");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if (!message) {
     LOG4CXX_WARN(logger_, "Null-pointer message received.");
-    NOTREACHED();
     return false;
   }
 
+  if (IsLowVoltage()) {
+    LOG4CXX_WARN(logger_, "Low Voltage is active");
+    return false;
+  }
 
   MessageHelper::PrintSmartObject(*message);
 
@@ -1440,19 +1455,6 @@ bool ApplicationManagerImpl::ManageHMICommand(
 
 bool ApplicationManagerImpl::Init() {
   LOG4CXX_TRACE(logger_, "Init application manager");
-  if (policy::PolicyHandler::instance()->PolicyEnabled()) {
-    if(!policy::PolicyHandler::instance()->LoadPolicyLibrary()) {
-      LOG4CXX_ERROR(logger_, "Policy library is not loaded. Check LD_LIBRARY_PATH");
-      return false;
-    }
-    LOG4CXX_INFO(logger_, "Policy library is loaded, now initing PT");
-    if (!policy::PolicyHandler::instance()->InitPolicyTable()) {
-      LOG4CXX_ERROR(logger_, "Policy table is not initialized.");
-      return false;
-    }
-  } else {
-    LOG4CXX_WARN(logger_, "System is configured to work without policy functionality.");
-  }
   const std::string app_storage_folder =
       profile::Profile::instance()->app_storage_folder();
   if (!file_system::DirectoryExists(app_storage_folder)) {
@@ -1488,6 +1490,19 @@ bool ApplicationManagerImpl::Init() {
                   "System directory doesn't have read/write permissions");
     return false;
   }
+  if (policy::PolicyHandler::instance()->PolicyEnabled()) {
+    if(!policy::PolicyHandler::instance()->LoadPolicyLibrary()) {
+      LOG4CXX_ERROR(logger_, "Policy library is not loaded. Check LD_LIBRARY_PATH");
+      return false;
+    }
+    LOG4CXX_INFO(logger_, "Policy library is loaded, now initing PT");
+    if (!policy::PolicyHandler::instance()->InitPolicyTable()) {
+      LOG4CXX_ERROR(logger_, "Policy table is not initialized.");
+      return false;
+    }
+  } else {
+    LOG4CXX_WARN(logger_, "System is configured to work without policy functionality.");
+  }
   media_manager_ = media_manager::MediaManagerImpl::instance();
   return true;
 }
@@ -1852,6 +1867,7 @@ void ApplicationManagerImpl::removeNotification(const commands::Command* notific
 void ApplicationManagerImpl::updateRequestTimeout(uint32_t connection_key,
     uint32_t mobile_correlation_id,
     uint32_t new_timeout_value) {
+  LOG4CXX_AUTO_TRACE(logger_);
   request_ctrl_.updateRequestTimeout(connection_key, mobile_correlation_id,
                                      new_timeout_value);
 }
@@ -1878,6 +1894,7 @@ void ApplicationManagerImpl::set_application_id(const int32_t correlation_id,
 
 void ApplicationManagerImpl::SetUnregisterAllApplicationsReason(
   mobile_api::AppInterfaceUnregisteredReason::eType reason) {
+  LOG4CXX_TRACE(logger_, "reason = " << reason);
   unregister_reason_ = reason;
 }
 
@@ -1885,9 +1902,11 @@ void ApplicationManagerImpl::HeadUnitReset(
     mobile_api::AppInterfaceUnregisteredReason::eType reason) {
   switch (reason) {
     case mobile_api::AppInterfaceUnregisteredReason::MASTER_RESET: {
+      UnregisterAllApplications();
+      policy::PolicyHandler::instance()->ResetPolicyTable();
+      policy::PolicyHandler::instance()->UnloadPolicyLibrary();
       file_system::remove_directory_content(profile::Profile::instance()->app_storage_folder());
       resume_controller().ClearResumptionInfo();
-      policy::PolicyHandler::instance()->ResetPolicyTable();
       break;
     }
     case mobile_api::AppInterfaceUnregisteredReason::FACTORY_DEFAULTS: {
@@ -1901,12 +1920,9 @@ void ApplicationManagerImpl::HeadUnitReset(
   }
 }
 
-void ApplicationManagerImpl::HeadUnitSuspend() {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::HeadUnitSuspend");
-}
 
 void ApplicationManagerImpl::SendOnSDLClose() {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::SendOnSDLClose");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // must be sent to PASA HMI on shutdown synchronously
   smart_objects::SmartObject* msg = new smart_objects::SmartObject(
@@ -1956,9 +1972,9 @@ void ApplicationManagerImpl::SendOnSDLClose() {
   hmi_handler_->SendMessageToHMI(message_to_send);
 }
 
+
 void ApplicationManagerImpl::UnregisterAllApplications(bool generated_by_hmi) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::UnregisterAllApplications " <<
-               unregister_reason_);
+  LOG4CXX_DEBUG(logger_, "Unregister reason  " << unregister_reason_);
 
   hmi_cooperating_ = false;
 
@@ -1973,32 +1989,33 @@ void ApplicationManagerImpl::UnregisterAllApplications(bool generated_by_hmi) {
   std::set<ApplicationSharedPtr>::iterator it = application_list_.begin();
   while (it != application_list_.end()) {
     ApplicationSharedPtr app_to_remove = *it;
-    MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile(
-        app_to_remove->app_id(), unregister_reason_);
+      MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile(
+          app_to_remove->app_id(), unregister_reason_);
     UnregisterApplication(app_to_remove->app_id(),
                           mobile_apis::Result::INVALID_ENUM, is_ignition_off,
                           is_unexpected_disconnect);
-
-    connection_handler_->CloseSession(app_to_remove->app_id());
+    connection_handler_->CloseSession(app_to_remove->app_id(),
+                                      connection_handler::kCommon);
     it = application_list_.begin();
   }
 
   if (is_ignition_off) {
-   resume_controller().IgnitionOff();
+    resume_controller().IgnitionOff();
   }
+
   request_ctrl_.terminateAllHMIRequests();
 }
 
 void ApplicationManagerImpl::UnregisterApplication(
   const uint32_t& app_id, mobile_apis::Result::eType reason,
   bool is_resuming, bool is_unexpected_disconnect) {
-  LOG4CXX_INFO(logger_,
-               "ApplicationManagerImpl::UnregisterApplication " << app_id);
+  LOG4CXX_INFO(logger_, "app_id = " << app_id
+               << "; reason = " << reason
+               << "; is_resuming = " << is_resuming
+               << "; is_unexpected_disconnect = " << is_unexpected_disconnect);
   //remove appID from tts_global_properties_app_list_
   RemoveAppFromTTSGlobalPropertiesList(app_id);
 
-  sync_primitives::AutoLock lock(applications_list_lock_);
-
   switch (reason) {
     case mobile_apis::Result::SUCCESS:break;
     case mobile_apis::Result::DISALLOWED: break;
@@ -2006,7 +2023,10 @@ void ApplicationManagerImpl::UnregisterApplication(
     case mobile_apis::Result::INVALID_CERT: break;
     case mobile_apis::Result::EXPIRED_CERT: break;
     case mobile_apis::Result::TOO_MANY_PENDING_REQUESTS: {
-      application(app_id)->usage_report().RecordRemovalsForBadBehavior();
+        ApplicationSharedPtr app_ptr = application(app_id);
+        if(app_ptr) {
+          app_ptr->usage_report().RecordRemovalsForBadBehavior();
+        }
       break;
     }
     default: {
@@ -2016,6 +2036,7 @@ void ApplicationManagerImpl::UnregisterApplication(
   }
 
   ApplicationSharedPtr app_to_remove;
+  applications_list_lock_.Acquire();
   std::set<ApplicationSharedPtr>::const_iterator it = application_list_.begin();
   for (; it != application_list_.end(); ++it) {
     if ((*it)->app_id() == app_id) {
@@ -2025,12 +2046,15 @@ void ApplicationManagerImpl::UnregisterApplication(
   }
   if (!app_to_remove) {
     LOG4CXX_ERROR(logger_, "Cant find application with app_id = " << app_id);
+    applications_list_lock_.Release();
     return;
   }
   application_list_.erase(app_to_remove);
-
+  applications_list_lock_.Release();
   if (is_resuming) {
-    resume_ctrl_.SaveApplication(app_to_remove);
+      resume_ctrl_.SaveApplication(app_to_remove);
+  } else {
+    resume_ctrl_.RemoveApplicationFromSaved(app_to_remove);
   }
 
   if (audio_pass_thru_active_) {
@@ -2051,7 +2075,7 @@ void ApplicationManagerImpl::UnregisterRevokedApplication(
     const uint32_t& app_id, mobile_apis::Result::eType reason) {
   UnregisterApplication(app_id, reason);
 
-  connection_handler_->CloseSession(app_id);
+  connection_handler_->CloseSession(app_id, connection_handler::kCommon);
 
   if (application_list_.empty()) {
     connection_handler_->CloseRevokedConnection(app_id);
@@ -2069,7 +2093,13 @@ void ApplicationManagerImpl::Handle(const impl::MessageFromMobile message) {
 }
 
 void ApplicationManagerImpl::Handle(const impl::MessageToMobile message) {
-  protocol_handler::RawMessage* rawMessage = 0;
+  if (!protocol_handler_) {
+    LOG4CXX_WARN(logger_,
+                 "Protocol Handler is not set; cannot send message to mobile.");
+    return;
+  }
+
+  utils::SharedPtr<protocol_handler::RawMessage> rawMessage;
   if (message->protocol_version() == application_manager::kV1) {
     rawMessage = MobileMessageHandler::HandleOutgoingMessageProtocolV1(message);
   } else if ((message->protocol_version() == application_manager::kV2) ||
@@ -2078,18 +2108,12 @@ void ApplicationManagerImpl::Handle(const impl::MessageToMobile message) {
   } else {
     return;
   }
+
   if (!rawMessage) {
     LOG4CXX_ERROR(logger_, "Failed to create raw message.");
     return;
   }
 
-  if (!protocol_handler_) {
-    LOG4CXX_WARN(logger_,
-                 "Protocol Handler is not set; cannot send message to mobile.");
-    return;
-  }
-
-
   bool is_final = message.is_final;
   bool close_session = false;
   if (is_final) {
@@ -2103,7 +2127,8 @@ void ApplicationManagerImpl::Handle(const impl::MessageToMobile message) {
   LOG4CXX_INFO(logger_, "Message for mobile given away");
 
   if (close_session) {
-    connection_handler_->CloseSession(message->connection_key());
+    connection_handler_->CloseSession(message->connection_key(),
+                                      connection_handler::kCommon);
   }
 }
 
@@ -2129,6 +2154,41 @@ void ApplicationManagerImpl::Handle(const impl::MessageToHmi message) {
   LOG4CXX_INFO(logger_, "Message to hmi given away.");
 }
 
+void ApplicationManagerImpl::Handle(const impl::AudioData message) {
+  LOG4CXX_INFO(logger_, "Send AudioPassThru notification");
+  smart_objects::SmartObject* on_audio_pass = NULL;
+  on_audio_pass = new smart_objects::SmartObject();
+
+  if (NULL == on_audio_pass) {
+    LOG4CXX_ERROR_EXT(logger_, "OnAudioPassThru NULL pointer");
+  return;
+  }
+
+  LOG4CXX_INFO_EXT(logger_, "Fill smart object");
+
+  (*on_audio_pass)[strings::params][strings::message_type] =
+      application_manager::MessageType::kNotification;
+
+  (*on_audio_pass)[strings::params][strings::connection_key] =
+      static_cast<int32_t>(message.session_key);
+  (*on_audio_pass)[strings::params][strings::function_id] =
+      mobile_apis::FunctionID::OnAudioPassThruID;
+
+  LOG4CXX_INFO_EXT(logger_, "Fill binary data");
+  // binary data
+  (*on_audio_pass)[strings::params][strings::binary_data] =
+      smart_objects::SmartObject(message.binary_data);
+
+   LOG4CXX_INFO_EXT(logger_, "After fill binary data");
+
+   LOG4CXX_INFO_EXT(logger_, "Send data");
+   CommandSharedPtr command (
+       MobileCommandFactory::CreateCommand(&(*on_audio_pass)));
+   command->Init();
+   command->Run();
+   command->CleanUp();
+}
+
 mobile_apis::Result::eType ApplicationManagerImpl::CheckPolicyPermissions(
     const std::string& policy_app_id,
     mobile_apis::HMILevel::eType hmi_level,
@@ -2200,6 +2260,24 @@ mobile_apis::Result::eType ApplicationManagerImpl::CheckPolicyPermissions(
   return mobile_api::Result::SUCCESS;
 }
 
+
+void  ApplicationManagerImpl::OnLowVoltage() {
+    LOG4CXX_AUTO_TRACE(logger_);
+    is_low_voltage_ = true;
+    request_ctrl_.OnLowVoltage();
+}
+
+bool ApplicationManagerImpl::IsLowVoltage() {
+  LOG4CXX_TRACE(logger_, "result: " << is_low_voltage_);
+  return is_low_voltage_;
+}
+
+void ApplicationManagerImpl::OnWakeUp() {
+    LOG4CXX_AUTO_TRACE(logger_);
+    is_low_voltage_ = false;
+    request_ctrl_.OnWakeUp();
+}
+
 void ApplicationManagerImpl::Mute(VRTTSSessionChanging changing_state) {
   mobile_apis::AudioStreamingState::eType state =
     hmi_capabilities_.attenuated_supported()
@@ -2375,11 +2453,12 @@ void ApplicationManagerImpl::OnTimerSendTTSGlobalProperties() {
 
 void ApplicationManagerImpl::AddAppToTTSGlobalPropertiesList(
     const uint32_t app_id) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::AddAppToTTSGlobalPropertiesList");
+  LOG4CXX_AUTO_TRACE(logger_);
   uint16_t timeout = profile::Profile::instance()->tts_global_properties_timeout();
   TimevalStruct current_time = date_time::DateTime::getCurrentTime();
   current_time.tv_sec += timeout;
-  sync_primitives::AutoLock lock(tts_global_properties_app_list_lock_);
+  // please avoid AutoLock usage to avoid deadlock
+  tts_global_properties_app_list_lock_.Acquire();
   if (tts_global_properties_app_list_.end() ==
       tts_global_properties_app_list_.find(app_id)) {
     tts_global_properties_app_list_[app_id] = current_time;
@@ -2387,28 +2466,35 @@ void ApplicationManagerImpl::AddAppToTTSGlobalPropertiesList(
   //if add first item need to start timer on one second
   if (1 == tts_global_properties_app_list_.size()) {
     LOG4CXX_INFO(logger_, "Start tts_global_properties_timer_");
+    tts_global_properties_app_list_lock_.Release();
     tts_global_properties_timer_.start(1);
+    return;
   }
+  tts_global_properties_app_list_lock_.Release();
 }
 
 void ApplicationManagerImpl::RemoveAppFromTTSGlobalPropertiesList(
     const uint32_t app_id) {
-  LOG4CXX_INFO(logger_, "ApplicationManagerImpl::RemoveAppFromTTSGlobalPropertiesList");
-  sync_primitives::AutoLock lock(tts_global_properties_app_list_lock_);
+  LOG4CXX_AUTO_TRACE(logger_);
+  // please avoid AutoLock usage to avoid deadlock
+  tts_global_properties_app_list_lock_.Acquire();
   std::map<uint32_t, TimevalStruct>::iterator it =
       tts_global_properties_app_list_.find(app_id);
   if (tts_global_properties_app_list_.end() != it) {
     tts_global_properties_app_list_.erase(it);
-    if (!(tts_global_properties_app_list_.size())) {
+    if (tts_global_properties_app_list_.empty()) {
       LOG4CXX_INFO(logger_, "Stop tts_global_properties_timer_");
-      //if container is empty need to stop timer
-      tts_global_properties_timer_.stop();
+      // if container is empty need to stop timer
+      tts_global_properties_app_list_lock_.Release();
+      tts_global_properties_timer_.pause();
+      return;
     }
   }
+  tts_global_properties_app_list_lock_.Release();
 }
 
 void ApplicationManagerImpl::CreatePhoneCallAppList() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::ApplicationListAccessor accessor;
   ApplicationManagerImpl::TAppList local_app_list = accessor.applications();
@@ -2436,7 +2522,7 @@ void ApplicationManagerImpl::CreatePhoneCallAppList() {
 }
 
 void ApplicationManagerImpl::ResetPhoneCallAppList() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::ApplicationListAccessor accessor;
   ApplicationManagerImpl::TAppList local_app_list = accessor.applications();
@@ -2458,4 +2544,113 @@ void ApplicationManagerImpl::ResetPhoneCallAppList() {
   on_phone_call_app_list_.clear();
 }
 
+mobile_apis::AppHMIType::eType ApplicationManagerImpl::StringToAppHMIType(std::string str) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if ("DEFAULT" == str) {
+    return mobile_apis::AppHMIType::DEFAULT;
+  } else if ("COMMUNICATION" == str) {
+    return mobile_apis::AppHMIType::COMMUNICATION;
+  } else if ("MEDIA" == str) {
+    return mobile_apis::AppHMIType::MEDIA;
+  } else if ("MESSAGING" == str) {
+    return mobile_apis::AppHMIType::MESSAGING;
+  } else if ("NAVIGATION" == str) {
+    return mobile_apis::AppHMIType::NAVIGATION;
+  } else if ("INFORMATION" == str) {
+    return mobile_apis::AppHMIType::INFORMATION;
+  } else if ("SOCIAL" == str) {
+    return mobile_apis::AppHMIType::SOCIAL;
+  } else if ("BACKGROUND_PROCESS" == str) {
+    return mobile_apis::AppHMIType::BACKGROUND_PROCESS;
+  } else if ("TESTING" == str) {
+    return mobile_apis::AppHMIType::TESTING;
+  } else if ("SYSTEM" == str) {
+    return mobile_apis::AppHMIType::SYSTEM;
+  } else {
+    return mobile_apis::AppHMIType::INVALID_ENUM;
+  }
+}
+
+bool ApplicationManagerImpl::CompareAppHMIType (const smart_objects::SmartObject& from_policy,
+                                                const smart_objects::SmartObject& from_application) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  bool equal = false;
+  uint32_t lenght_policy_app_types = from_policy.length();
+  uint32_t lenght_application_app_types = from_application.length();
+
+  for(uint32_t i = 0; i < lenght_application_app_types; ++i) {
+    for(uint32_t k = 0; k < lenght_policy_app_types; ++k) {
+      if (from_application[i] == from_policy[k]) {
+        equal = true;
+        break;
+      }
+    }
+    if(!equal) {
+      return false;
+    }
+    equal = false;
+  }
+  return true;
+}
+
+void ApplicationManagerImpl::OnUpdateHMIAppType(std::map<std::string, std::vector<std::string> > app_hmi_types) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  sync_primitives::AutoLock lock(applications_list_lock_);
+  std::map<std::string, std::vector<std::string> >::iterator it_app_hmi_types_from_policy;
+  std::vector<std::string> hmi_types_from_policy;
+  smart_objects::SmartObject transform_app_hmi_types(smart_objects::SmartType_Array);
+  const smart_objects::SmartObject *save_application_hmi_type = NULL;
+  bool flag_diffirence_app_hmi_type = false;
+
+  for (TAppListIt it = application_list_.begin();
+      it != application_list_.end(); ++it) {
+
+    it_app_hmi_types_from_policy =
+        app_hmi_types.find(((*it)->mobile_app_id())->asString());
+
+    if (it_app_hmi_types_from_policy != app_hmi_types.end() &&
+        ((it_app_hmi_types_from_policy->second).size())) {
+      flag_diffirence_app_hmi_type = false;
+      hmi_types_from_policy = (it_app_hmi_types_from_policy->second);
+
+      if(transform_app_hmi_types.length()) {
+        transform_app_hmi_types =
+            smart_objects::SmartObject(smart_objects::SmartType_Array);
+      }
+
+      for(uint32_t i = 0; i < hmi_types_from_policy.size(); ++i) {
+        transform_app_hmi_types[i] = StringToAppHMIType(hmi_types_from_policy[i]);
+      }
+
+      save_application_hmi_type = (*it)->app_types();
+
+      if (save_application_hmi_type == NULL ||
+          ((*save_application_hmi_type).length() != transform_app_hmi_types.length())) {
+        flag_diffirence_app_hmi_type = true;
+      } else {
+        flag_diffirence_app_hmi_type = !(CompareAppHMIType(transform_app_hmi_types,
+                                                        *save_application_hmi_type));
+      }
+
+      if (flag_diffirence_app_hmi_type) {
+        (*it)->set_app_types(transform_app_hmi_types);
+        (*it)->ChangeSupportingAppHMIType();
+        if ((*it)->hmi_level() == mobile_api::HMILevel::HMI_BACKGROUND) {
+
+          MessageHelper::SendUIChangeRegistrationRequestToHMI(*it);
+        } else if (((*it)->hmi_level() == mobile_api::HMILevel::HMI_FULL) ||
+            ((*it)->hmi_level() == mobile_api::HMILevel::HMI_LIMITED)) {
+
+          MessageHelper::SendActivateAppToHMI((*it)->app_id(),
+                                              hmi_apis::Common_HMILevel::BACKGROUND,
+                                              false);
+          MessageHelper::SendUIChangeRegistrationRequestToHMI(*it);
+          (*it)->set_hmi_level(mobile_api::HMILevel::HMI_BACKGROUND);
+          MessageHelper::SendHMIStatusNotification(*(*it));
+        }
+      }
+    }
+  }
+}
 }  // namespace application_manager
diff --git a/src/components/application_manager/src/commands/command_impl.cc b/src/components/application_manager/src/commands/command_impl.cc
index 86b764c46a..66c0e2c631 100644
--- a/src/components/application_manager/src/commands/command_impl.cc
+++ b/src/components/application_manager/src/commands/command_impl.cc
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc
index 5f8757754f..9967dcc113 100644
--- a/src/components/application_manager/src/commands/command_request_impl.cc
+++ b/src/components/application_manager/src/commands/command_request_impl.cc
@@ -75,7 +75,7 @@ CommandRequestImpl::CommandRequestImpl(const MessageSharedPtr& message)
 CommandRequestImpl::~CommandRequestImpl() {
 }
 
-bool CommandRequestImpl::Init() {  
+bool CommandRequestImpl::Init() {
   return true;
 }
 
@@ -91,10 +91,11 @@ void CommandRequestImpl::Run() {
 }
 
 void CommandRequestImpl::onTimeOut() {
-  LOG4CXX_INFO(logger_, "CommandRequestImpl::onTimeOut");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   unsubscribe_from_all_events();
   {
+    // FIXME (dchmerev@luxoft.com): atomic_xchg fits better
     sync_primitives::AutoLock auto_lock(state_lock_);
     if (kCompleted == current_state_) {
       // don't send timeout if request completed
@@ -205,7 +206,7 @@ void CommandRequestImpl::SendHMIRequest(
   const uint32_t hmi_correlation_id =
        ApplicationManagerImpl::instance()->GetNextHMICorrelationID();
   if (use_events) {
-    LOG4CXX_WARN(logger_, "subscribe_on_event " << function_id << " " << hmi_correlation_id);
+    LOG4CXX_DEBUG(logger_, "subscribe_on_event " << function_id << " " << hmi_correlation_id);
     subscribe_on_event(function_id, hmi_correlation_id);
   }
 
@@ -385,7 +386,10 @@ bool CommandRequestImpl::CheckAllowedParameters() {
         smart_objects::SmartMap::iterator iter_end = s_map.map_end();
 
         for (; iter != iter_end; ++iter) {
-          params.push_back(iter->first);
+          if (true == iter->second.asBool()) {
+            LOG4CXX_INFO(logger_, "Request's param: " << iter->first);
+            params.push_back(iter->first);
+          }
         }
       }
 
diff --git a/src/components/application_manager/src/commands/hmi/activate_app_request.cc b/src/components/application_manager/src/commands/hmi/activate_app_request.cc
index 29d998640e..5d4d8b352a 100644
--- a/src/components/application_manager/src/commands/hmi/activate_app_request.cc
+++ b/src/components/application_manager/src/commands/hmi/activate_app_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -69,7 +69,7 @@ namespace application_manager {
 
 
     void ActivateAppRequest::on_event(const event_engine::Event& event) {
-      LOG4CXX_TRACE_ENTER(logger_);
+      LOG4CXX_AUTO_TRACE(logger_);
       const smart_objects::SmartObject* response = &(event.smart_object());
       const hmi_apis::Common_Result::eType code =
           static_cast<hmi_apis::Common_Result::eType>(
@@ -82,8 +82,15 @@ namespace application_manager {
       // Mobile id is converted to HMI id for HMI requests
       const uint32_t hmi_app_id = ApplicationManagerImpl::instance()->
                                   application_id(correlation_id);
-      mobile_apis::HMILevel::eType requested_hmi_level = static_cast<mobile_apis::HMILevel::eType>(
-          (*message_)[strings::msg_params][strings::activate_app_hmi_level].asInt());
+
+      mobile_apis::HMILevel::eType requested_hmi_level = mobile_apis::HMILevel::HMI_FULL;
+      if ((*message_)[strings::msg_params].keyExists(
+            strings::activate_app_hmi_level)) {
+        requested_hmi_level = static_cast<mobile_apis::HMILevel::eType>(
+                   (*message_)[strings::msg_params][strings::activate_app_hmi_level].asInt());
+        LOG4CXX_INFO(logger_, "requested_hmi_level = " << requested_hmi_level);
+      }
+
       if (0 == hmi_app_id) {
         LOG4CXX_ERROR(logger_, "Error hmi_app_id = "<< hmi_app_id);
         return;
@@ -95,8 +102,10 @@ namespace application_manager {
         LOG4CXX_ERROR(logger_, "Application can't be activated.");
         return;
       }
+
       if (mobile_apis::HMILevel::HMI_FULL == requested_hmi_level) {
         if (ApplicationManagerImpl::instance()->ActivateApplication(application)) {
+          LOG4CXX_DEBUG(logger_, "Put Application in FULL succes");
           MessageHelper::SendHMIStatusNotification(*(application.get()));
         }
       }
diff --git a/src/components/application_manager/src/commands/hmi/activate_app_response.cc b/src/components/application_manager/src/commands/hmi/activate_app_response.cc
index aba5886097..2f63198d82 100644
--- a/src/components/application_manager/src/commands/hmi/activate_app_response.cc
+++ b/src/components/application_manager/src/commands/hmi/activate_app_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc b/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc
index c11621045e..73c9a49def 100644
--- a/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ AddStatisticsInfoNotification::~AddStatisticsInfoNotification() {
 }
 
 void AddStatisticsInfoNotification::Run() {
-  LOG4CXX_INFO(logger_, "AddStatisticsInfoNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   int type = (*message_)[strings::msg_params][hmi_notification::statistic_type]
       .asInt();
diff --git a/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc b/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc
index 6ac42c7a00..548238f00f 100644
--- a/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc
+++ b/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ AllowAllAppsRequest::~AllowAllAppsRequest() {
 }
 
 void AllowAllAppsRequest::Run() {
-  LOG4CXX_INFO(logger_, "AllowAllAppsRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc b/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc
index 69c52a3269..eca9363254 100644
--- a/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc
+++ b/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ AllowAllAppsResponse::~AllowAllAppsResponse() {
 }
 
 void AllowAllAppsResponse::Run() {
-  LOG4CXX_INFO(logger_, "AllowAllAppsResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->set_all_apps_allowed(
       (*message_)[strings::msg_params][hmi_response::allowed].asBool());
diff --git a/src/components/application_manager/src/commands/hmi/allow_app_request.cc b/src/components/application_manager/src/commands/hmi/allow_app_request.cc
index 302a8c6766..2f0d4bcc98 100644
--- a/src/components/application_manager/src/commands/hmi/allow_app_request.cc
+++ b/src/components/application_manager/src/commands/hmi/allow_app_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ AllowAppRequest::~AllowAppRequest() {
 }
 
 void AllowAppRequest::Run() {
-  LOG4CXX_INFO(logger_, "AllowAppRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/allow_app_response.cc b/src/components/application_manager/src/commands/hmi/allow_app_response.cc
index 035e41438d..7a7f3dd560 100644
--- a/src/components/application_manager/src/commands/hmi/allow_app_response.cc
+++ b/src/components/application_manager/src/commands/hmi/allow_app_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ AllowAppResponse::~AllowAppResponse() {
 }
 
 void AllowAppResponse::Run() {
-  LOG4CXX_INFO(logger_, "AllowAppResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   uint32_t connection_key =
     (*message_)[strings::params][strings::connection_key].asInt();
diff --git a/src/components/application_manager/src/commands/hmi/basic_communication_on_awake_sdl.cc b/src/components/application_manager/src/commands/hmi/basic_communication_on_awake_sdl.cc
new file mode 100644
index 0000000000..b34752a00f
--- /dev/null
+++ b/src/components/application_manager/src/commands/hmi/basic_communication_on_awake_sdl.cc
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2014, Ford Motor Company
+ * 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 Ford Motor Company 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 HOLDER 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/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc b/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc
index 0d2bcca4f4..d0251a7276 100644
--- a/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc
+++ b/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ BasicCommunicationSystemRequest::~BasicCommunicationSystemRequest() {
 }
 
 void BasicCommunicationSystemRequest::Run() {
-  LOG4CXX_INFO(logger_, "BasicCommunicationSystemRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   SendRequest();
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc b/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc
index dd9f657adc..6106266d19 100644
--- a/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc
+++ b/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ BasicCommunicationSystemResponse::~BasicCommunicationSystemResponse() {
 }
 
 void BasicCommunicationSystemResponse::Run() {
-  LOG4CXX_INFO(logger_, "BasicCommunicationSystemResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_SystemRequest);
   event.set_smart_object(*message_);
   event.raise();
diff --git a/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc
index e00b3fdc5a..87cf1aa783 100644
--- a/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc
+++ b/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ ButtonGetCapabilitiesRequest::~ButtonGetCapabilitiesRequest() {
 }
 
 void ButtonGetCapabilitiesRequest::Run() {
-  LOG4CXX_INFO(logger_, "ButtonGetCapabilitiesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc
index 0b67234743..69cfbe49c5 100644
--- a/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc
+++ b/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ ButtonGetCapabilitiesResponse::~ButtonGetCapabilitiesResponse() {
 }
 
 void ButtonGetCapabilitiesResponse::Run() {
-  LOG4CXX_INFO(logger_, "ButtonGetCapabilitiesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/close_popup_request.cc b/src/components/application_manager/src/commands/hmi/close_popup_request.cc
index 3cc5818688..352a281348 100644
--- a/src/components/application_manager/src/commands/hmi/close_popup_request.cc
+++ b/src/components/application_manager/src/commands/hmi/close_popup_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ ClosePopupRequest::~ClosePopupRequest() {
 }
 
 void ClosePopupRequest::Run() {
-  LOG4CXX_INFO(logger_, "ClosePopupRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/close_popup_response.cc b/src/components/application_manager/src/commands/hmi/close_popup_response.cc
index fa98be5e02..078d24ef2d 100644
--- a/src/components/application_manager/src/commands/hmi/close_popup_response.cc
+++ b/src/components/application_manager/src/commands/hmi/close_popup_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -43,7 +43,7 @@ ClosePopupResponse::~ClosePopupResponse() {
 }
 
 void ClosePopupResponse::Run() {
-  LOG4CXX_INFO(logger_, "ClosePopupResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // TODO(VS): Process response from HMI
 }
diff --git a/src/components/application_manager/src/commands/hmi/get_system_info_request.cc b/src/components/application_manager/src/commands/hmi/get_system_info_request.cc
index 53a084d23e..9024331462 100644
--- a/src/components/application_manager/src/commands/hmi/get_system_info_request.cc
+++ b/src/components/application_manager/src/commands/hmi/get_system_info_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ GetSystemInfoRequest::~GetSystemInfoRequest() {
 }
 
 void GetSystemInfoRequest::Run() {
-  LOG4CXX_INFO(logger_, "GetSystemInfoRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t correlation_id = RequestToHMI::correlation_id();
   uint32_t app_id = RequestToHMI::application_id();
   ApplicationManagerImpl::instance()->set_application_id(correlation_id, app_id);
diff --git a/src/components/application_manager/src/commands/hmi/get_system_info_response.cc b/src/components/application_manager/src/commands/hmi/get_system_info_response.cc
index 090b04c3e3..7cfd1b5797 100644
--- a/src/components/application_manager/src/commands/hmi/get_system_info_response.cc
+++ b/src/components/application_manager/src/commands/hmi/get_system_info_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ GetSystemInfoResponse::~GetSystemInfoResponse() {
 }
 
 void GetSystemInfoResponse::Run() {
-  LOG4CXX_INFO(logger_, "GetSystemInfoResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   const hmi_apis::Common_Result::eType code =
       static_cast<hmi_apis::Common_Result::eType>(
           (*message_)[strings::params][hmi_response::code].asInt());
diff --git a/src/components/application_manager/src/commands/hmi/get_urls.cc b/src/components/application_manager/src/commands/hmi/get_urls.cc
index b3d0f60610..70ca40d1ed 100644
--- a/src/components/application_manager/src/commands/hmi/get_urls.cc
+++ b/src/components/application_manager/src/commands/hmi/get_urls.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,27 +46,48 @@ GetUrls::~GetUrls() {
 }
 
 void GetUrls::Run() {
-  LOG4CXX_INFO(logger_, "GetUrls::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject& object = *message_;
   object[strings::params][strings::message_type] = MessageType::kResponse;
   if (policy::PolicyHandler::instance()->PolicyEnabled()) {
-    policy::EndpointUrls endpoints =
-      policy::PolicyHandler::instance()->GetUpdateUrls(
-        object[strings::msg_params][hmi_request::service].asInt());
-    object[strings::msg_params].erase(hmi_request::service);
-    object[strings::msg_params][hmi_response::urls] =
-      smart_objects::SmartObject(smart_objects::SmartType_Array);
-    for (size_t i = 0; i < endpoints.size(); ++i) {
-      std::string url = endpoints[i].url.empty() ? "" : endpoints[i].url[0];
-      object[strings::msg_params][hmi_response::urls][i][strings::url] = url;
-      if (policy::kDefaultId != endpoints[i].app_id) {
-        object[strings::msg_params][hmi_response::urls][i][hmi_response::policy_app_id] =
-          endpoints[i].app_id;
+    policy::EndpointUrls endpoints;
+    policy::PolicyHandler::instance()->GetUpdateUrls(
+        object[strings::msg_params][hmi_request::service].asInt(), endpoints);
+    if (!endpoints.empty()) {
+      object[strings::msg_params].erase(hmi_request::service);
+
+      object[strings::msg_params][hmi_response::urls] =
+        smart_objects::SmartObject(smart_objects::SmartType_Array);
+
+      smart_objects::SmartObject& urls =
+          object[strings::msg_params][hmi_response::urls];
+
+      size_t index = 0;
+
+      for (size_t i = 0; i < endpoints.size(); ++i) {
+        for (size_t k = 0; k < endpoints[i].url.size(); ++k, ++index) {
+          const std::string url = endpoints[i].url[k];
+
+          urls[index] = smart_objects::SmartObject(
+                smart_objects::SmartType_Map);
+          smart_objects::SmartObject& service_info = urls[index];
+
+          service_info[strings::url] = url;
+          if (policy::kDefaultId != endpoints[i].app_id) {
+            service_info[hmi_response::policy_app_id] =
+              endpoints[i].app_id;
+          }
+        }
       }
+      object[strings::params][hmi_response::code] =
+          hmi_apis::Common_Result::SUCCESS;
+    } else {
+      object[strings::params][hmi_response::code] =
+          hmi_apis::Common_Result::DATA_NOT_AVAILABLE;
     }
-    object[strings::params][hmi_response::code] = hmi_apis::Common_Result::SUCCESS;
   } else {
-    object[strings::params][hmi_response::code] = hmi_apis::Common_Result::DATA_NOT_AVAILABLE;
+    object[strings::params][hmi_response::code] =
+        hmi_apis::Common_Result::DATA_NOT_AVAILABLE;
   }
   ApplicationManagerImpl::instance()->ManageHMICommand(message_);
 }
diff --git a/src/components/application_manager/src/commands/hmi/get_urls_response.cc b/src/components/application_manager/src/commands/hmi/get_urls_response.cc
index f8086affe3..b446f088bf 100644
--- a/src/components/application_manager/src/commands/hmi/get_urls_response.cc
+++ b/src/components/application_manager/src/commands/hmi/get_urls_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ GetUrlsResponse::~GetUrlsResponse() {
 }
 
 void GetUrlsResponse::Run() {
-  LOG4CXX_INFO(logger_, "GetUrlsResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
diff --git a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc
index 9ab4bf5dbb..059843355c 100644
--- a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc
+++ b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ MixingAudioSupportedRequest::~MixingAudioSupportedRequest() {
 }
 
 void MixingAudioSupportedRequest::Run() {
-  LOG4CXX_INFO(logger_, "MixingAudioSupportedRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc
index 4a4fc276de..2da8bdc453 100644
--- a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc
+++ b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ MixingAudioSupportedResponse::~MixingAudioSupportedResponse() {
 }
 
 void MixingAudioSupportedResponse::Run() {
-  LOG4CXX_INFO(logger_, "MixingAudioSupportedResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc
index 7128231b11..77b3701904 100644
--- a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ NaviAlertManeuverRequest::~NaviAlertManeuverRequest() {
 }
 
 void NaviAlertManeuverRequest::Run() {
-  LOG4CXX_INFO(logger_, "NaviAlertManeuverRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc
index 823c96211e..49d659777b 100644
--- a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ NaviAlertManeuverResponse::~NaviAlertManeuverResponse() {
 }
 
 void NaviAlertManeuverResponse::Run() {
-  LOG4CXX_INFO(logger_, "NaviAlertManeuverResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::Navigation_AlertManeuver);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc
index 3c7a7d3ab5..3908238ada 100644
--- a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ AudioStartStreamRequest::~AudioStartStreamRequest() {
 }
 
 void AudioStartStreamRequest::Run() {
-  LOG4CXX_INFO(logger_, "AudioStartStreamRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc
index e4cc8f4cc6..0509028a94 100644
--- a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ AudioStartStreamResponse::~AudioStartStreamResponse() {
 }
 
 void AudioStartStreamResponse::Run() {
-  LOG4CXX_INFO(logger_, "AudioStartStreamResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   ApplicationSharedPtr app =
       ApplicationManagerImpl::instance()->active_application();
 
diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc
index 4052769d53..ea00d5bc3b 100644
--- a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ AudioStopStreamRequest::~AudioStopStreamRequest() {
 }
 
 void AudioStopStreamRequest::Run() {
-  LOG4CXX_INFO(logger_, "AudioStopStreamRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc
index 81a6c62e8d..29e6708e19 100644
--- a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -43,7 +43,7 @@ AudioStopStreamResponse::~AudioStopStreamResponse() {
 }
 
 void AudioStopStreamResponse::Run() {
-  LOG4CXX_INFO(logger_, "AudioStopStreamResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc
index b7a1799427..4c00908781 100644
--- a/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ NaviIsReadyRequest::~NaviIsReadyRequest() {
 }
 
 void NaviIsReadyRequest::Run() {
-  LOG4CXX_INFO(logger_, "NaviIsReadyRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc
index 8aef42b40d..a3387aec33 100644
--- a/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ NaviIsReadyResponse::~NaviIsReadyResponse() {
 }
 
 void NaviIsReadyResponse::Run() {
-  LOG4CXX_INFO(logger_, "NaviIsReadyResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject& object = *message_;
 
   bool is_available = false;
diff --git a/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc b/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc
index f396a24323..94d569c4ef 100644
--- a/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ NaviSendLocationRequest::~NaviSendLocationRequest() {
 }
 
 void NaviSendLocationRequest::Run() {
-  LOG4CXX_INFO(logger_, "NaviSendLocationRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc b/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc
index 944ced170c..7ec5a5907d 100644
--- a/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ NaviSendLocationResponse::~NaviSendLocationResponse() {
 }
 
 void NaviSendLocationResponse::Run() {
-  LOG4CXX_INFO(logger_, "NaviSendLocationResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::Navigation_SendLocation);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc
index 9103e1f6c4..b477dc8dab 100644
--- a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ NaviShowConstantTBTRequest::~NaviShowConstantTBTRequest() {
 }
 
 void NaviShowConstantTBTRequest::Run() {
-  LOG4CXX_INFO(logger_, "NaviShowConstantTBTRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc
index 03c70dd81b..58878a3c0c 100644
--- a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ NaviShowConstantTBTResponse::~NaviShowConstantTBTResponse() {
 }
 
 void NaviShowConstantTBTResponse::Run() {
-  LOG4CXX_INFO(logger_, "NaviShowConstantTBTResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::Navigation_ShowConstantTBT);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc
index cb9dbd61e3..7ee3733e51 100644
--- a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ NaviStartStreamRequest::~NaviStartStreamRequest() {
 }
 
 void NaviStartStreamRequest::Run() {
-  LOG4CXX_INFO(logger_, "NaviStartStreamRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc
index 79d51dcb66..c2de690d63 100644
--- a/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ NaviStartStreamResponse::~NaviStartStreamResponse() {
 }
 
 void NaviStartStreamResponse::Run() {
-  LOG4CXX_INFO(logger_, "NaviStartStreamResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app =
       ApplicationManagerImpl::instance()->active_application();
diff --git a/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc
index 2f1e14a122..3d74c27535 100644
--- a/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc
@@ -13,7 +13,7 @@ NaviStopStreamRequest::~NaviStopStreamRequest() {
 }
 
 void NaviStopStreamRequest::Run() {
-  LOG4CXX_INFO(logger_, "NaviStopStreamRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc
index c368940d5b..0603df6a65 100644
--- a/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -43,7 +43,7 @@ NaviStopStreamResponse::~NaviStopStreamResponse() {
 }
 
 void NaviStopStreamResponse::Run() {
-  LOG4CXX_INFO(logger_, "NaviStopStreamResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc
index d0df9ec867..37037245fa 100644
--- a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ NaviUpdateTurnListRequest::~NaviUpdateTurnListRequest() {
 }
 
 void NaviUpdateTurnListRequest::Run() {
-  LOG4CXX_INFO(logger_, "NaviUpdateTurnListRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc
index d93b67bb52..d196db93e9 100644
--- a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ NaviUpdateTurnListResponse::~NaviUpdateTurnListResponse() {
 }
 
 void NaviUpdateTurnListResponse::Run() {
-  LOG4CXX_INFO(logger_, "NaviUpdateTurnListResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::Navigation_UpdateTurnList);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc b/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc
index 2b7ec13c43..f9645fb2e0 100644
--- a/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc
@@ -61,6 +61,9 @@ void NotificationFromHMI::Run() {
 
 void NotificationFromHMI::SendNotificationToMobile(
     const MessageSharedPtr& message) {
+
+  (*message)[strings::params][strings::message_type] =
+      static_cast<int32_t>(application_manager::MessageType::kNotification);
   ApplicationManagerImpl::instance()->ManageMobileCommand(message);
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc b/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc
index 020428d6c0..506413ce1e 100644
--- a/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnAllowSDLFunctionalityNotification::~OnAllowSDLFunctionalityNotification() {
 }
 
 void OnAllowSDLFunctionalityNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnAllowSDLFunctionalityNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t device_id = 0;
   if ((*message_)[strings::msg_params].keyExists("device")) {
     device_id = (*message_)[strings::msg_params]["device"]["id"].asUInt();
diff --git a/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc
index 8152244a9c..7e60eaadaf 100644
--- a/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -48,7 +48,7 @@ OnAppActivatedNotification::~OnAppActivatedNotification() {
 }
 
 void OnAppActivatedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnAppActivatedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t app_id = ((*message_)[strings::msg_params][strings::app_id]).asUInt();
   MessageHelper::SendActivateAppToHMI(app_id);
 }
diff --git a/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc
index 19dd91ab2a..892af48079 100644
--- a/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -49,7 +49,7 @@ OnAppDeactivatedNotification::~OnAppDeactivatedNotification() {
 }
 
 void OnAppDeactivatedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnAppDeactivatedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t app_id = (*message_)[strings::msg_params][strings::app_id].asUInt();
   ApplicationSharedPtr app =
       ApplicationManagerImpl::instance()->application(app_id);
@@ -89,21 +89,13 @@ void OnAppDeactivatedNotification::Run() {
           app->set_audio_streaming_state(mobile_api::AudioStreamingState::NOT_AUDIBLE);
         }
       }
-      // switch HMI level for all applications in FULL or LIMITED
-      ApplicationManagerImpl::ApplicationListAccessor accessor;
-      ApplicationManagerImpl::TAppList applications =
-          accessor.applications();
-      ApplicationManagerImpl::TAppListIt it =
-          applications.begin();
-      for (; applications.end() != it; ++it) {
-          ApplicationSharedPtr app = *it;
-          if (app.valid()) {
-            if (mobile_apis::HMILevel::eType::HMI_FULL == app->hmi_level() ||
-                mobile_apis::HMILevel::eType::HMI_LIMITED == app->hmi_level()) {
-                app->set_hmi_level(mobile_api::HMILevel::HMI_BACKGROUND);
-                MessageHelper::SendHMIStatusNotification(*app);
-            }
-          }
+      // HMI must send this notification for each active app
+      if (app.valid()) {
+        if (mobile_apis::HMILevel::eType::HMI_FULL == app->hmi_level() ||
+            mobile_apis::HMILevel::eType::HMI_LIMITED == app->hmi_level()) {
+          app->set_hmi_level(mobile_api::HMILevel::HMI_BACKGROUND);
+          MessageHelper::SendHMIStatusNotification(*app);
+        }
       }
       break;
     }
diff --git a/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc
index 26d580e83a..c786b486f4 100644
--- a/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ OnAppPermissionChangedNotification::~OnAppPermissionChangedNotification() {
 }
 
 void OnAppPermissionChangedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnAppPermissionChangedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   SendNotification();
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc
index 951a2ebdf1..69a18200fa 100644
--- a/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc
@@ -48,7 +48,7 @@ OnAppPermissionConsentNotification::~OnAppPermissionConsentNotification() {
 }
 
 void OnAppPermissionConsentNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnAppPermissionConsentNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params];
 
   uint32_t connection_key = 0;
diff --git a/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc
index 26bc396db6..fa96c01ea0 100644
--- a/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ OnAppRegisteredNotification::~OnAppRegisteredNotification() {
 }
 
 void OnAppRegisteredNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnAppRegisteredNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendNotification();
 }
diff --git a/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc
index 2bedcb0631..571c6f381c 100644
--- a/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnAppUnregisteredNotification::~OnAppUnregisteredNotification() {
 }
 
 void OnAppUnregisteredNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnAppUnregisteredNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   //sending event for delete VRCommand on PerformInteraction
   event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnAppUnregistered);
diff --git a/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc b/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc
index 23aceaa7d6..2beffc2bdd 100644
--- a/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnButtonEventNotification::OnButtonEventNotification(
 }
 
 void OnButtonEventNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnButtonEventNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   (*message_)[strings::params][strings::function_id] =
       static_cast<int32_t>(mobile_apis::FunctionID::OnButtonEventID);
diff --git a/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc b/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc
index 83bcbd7efa..261aa68ee7 100644
--- a/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ OnButtonPressNotification::OnButtonPressNotification(
 }
 
 void OnButtonPressNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnButtonPressNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   event_engine::Event event(hmi_apis::FunctionID::Buttons_OnButtonPress);
   event.set_smart_object(*message_);
   event.raise();
diff --git a/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc b/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc
index 537c246f42..5d73c7b80e 100644
--- a/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ OnDeviceChosenNotification::~OnDeviceChosenNotification() {
 }
 
 void OnDeviceChosenNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnDeviceChosenNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if ((*message_)[strings::msg_params].keyExists(strings::device_info)) {
     ApplicationManagerImpl::instance()->ConnectToDevice(
diff --git a/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc
index 8af2571b55..fbb2bcfe93 100644
--- a/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -30,10 +30,47 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <algorithm>
 #include "application_manager/commands/hmi/on_device_state_changed_notification.h"
 #include "application_manager/policies/policy_handler.h"
 #include "application_manager/message_helper.h"
 #include "interfaces/HMI_API.h"
+#include "encryption/hashing.h"
+
+namespace {
+        // TODO(AOleynik) : replace this !!!
+        void check_zero(const char& a, const char& b, std::string& bt_mac) {
+         if ('0' != a && '0' == b) {
+                bt_mac.push_back(a);
+                bt_mac.push_back(b);
+          } else if ('0' == a) {
+                bt_mac.push_back(b);
+          } else {
+                bt_mac.push_back(a);
+                bt_mac.push_back(b);
+          }
+        }
+
+        std::string convert_to_bt_mac(std::string& deviceInternalId) {
+          std::transform(deviceInternalId.begin(), deviceInternalId.end(),deviceInternalId.begin(), ::tolower);
+
+          std::string bt_mac;
+          check_zero(deviceInternalId[10], deviceInternalId[11], bt_mac);
+          bt_mac.push_back(':');
+          check_zero(deviceInternalId[8], deviceInternalId[9], bt_mac);
+          bt_mac.push_back(':');
+          check_zero(deviceInternalId[6], deviceInternalId[7], bt_mac);
+          bt_mac.push_back(':');
+          check_zero(deviceInternalId[4], deviceInternalId[5], bt_mac);
+          bt_mac.push_back(':');
+          check_zero(deviceInternalId[2], deviceInternalId[3], bt_mac);
+          bt_mac.push_back(':');
+          check_zero(deviceInternalId[0], deviceInternalId[1], bt_mac);
+
+          return bt_mac;
+        }
+
+}
 
 namespace application_manager {
 
@@ -48,10 +85,12 @@ OnDeviceStateChangedNotification::~OnDeviceStateChangedNotification() {
 }
 
 void OnDeviceStateChangedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnDeviceStateChangedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if ((*message_)[strings::msg_params]["deviceState"]
       == hmi_apis::Common_DeviceState::UNPAIRED) {
+        // It is expected, that "deviceInternalId" is the device MAC address in
+        // form XXXXXXXXXX
     std::string device_id = (*message_)[strings::msg_params]["deviceInternalId"]
                             .asString();
     if (device_id.empty()) {
@@ -59,6 +98,13 @@ void OnDeviceStateChangedNotification::Run() {
         device_id = MessageHelper::GetDeviceMacAddressForHandle(
                       (*message_)[strings::msg_params]["deviceId"]["id"].asInt());
       }
+    } else {
+     // Policy uses hashed MAC address as device_id
+     LOG4CXX_DEBUG(logger_,"Device_id from HMI: " << device_id);
+     std::string bt_mac = convert_to_bt_mac(device_id);
+     LOG4CXX_DEBUG(logger_,"Device_id as BT MAC: " << bt_mac);
+     device_id = encryption::MakeHash(bt_mac);
+     LOG4CXX_DEBUG(logger_,"Device_id hashed as BT MAC : " << device_id);
     }
     policy::PolicyHandler::instance()->RemoveDevice(device_id);
   }
@@ -67,4 +113,3 @@ void OnDeviceStateChangedNotification::Run() {
 }  // namespace commands
 
 }  // namespace application_manager
-
diff --git a/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc
index d5a8edc48d..947847fb31 100644
--- a/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -52,7 +52,7 @@ OnDriverDistractionNotification::~OnDriverDistractionNotification() {
 }
 
 void OnDriverDistractionNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnDriverDistractionNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const hmi_apis::Common_DriverDistractionState::eType state =
       static_cast<hmi_apis::Common_DriverDistractionState::eType>(
diff --git a/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc b/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc
index b284c81f21..ee34433e62 100644
--- a/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc
@@ -52,11 +52,12 @@ OnExitAllApplicationsNotification::~OnExitAllApplicationsNotification() {
 }
 
 void OnExitAllApplicationsNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnExitAllApplicationsNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const hmi_apis::Common_ApplicationsCloseReason::eType reason =
       static_cast<hmi_apis::Common_ApplicationsCloseReason::eType>(
           (*message_)[strings::msg_params][hmi_request::reason].asInt());
+  LOG4CXX_DEBUG(logger_, "Reason " << reason);
 
   mobile_api::AppInterfaceUnregisteredReason::eType mob_reason =
       mobile_api::AppInterfaceUnregisteredReason::INVALID_ENUM;
@@ -77,7 +78,6 @@ void OnExitAllApplicationsNotification::Run() {
       break;
     }
     case hmi_apis::Common_ApplicationsCloseReason::SUSPEND: {
-      app_manager->HeadUnitSuspend();
       SendOnSDLPersistenceComplete();
       return;
     }
@@ -93,13 +93,11 @@ void OnExitAllApplicationsNotification::Run() {
       mobile_api::AppInterfaceUnregisteredReason::FACTORY_DEFAULTS == mob_reason) {
     app_manager->HeadUnitReset(mob_reason);
   }
-
   kill(getpid(), SIGINT);
 }
 
 void OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete() {
-  LOG4CXX_INFO(logger_, ""
-      "OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   smart_objects::SmartObject* message =
       new smart_objects::SmartObject(smart_objects::SmartType_Map);
diff --git a/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc
index f4aed61392..2afa5bd1c8 100644
--- a/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -49,7 +49,7 @@ OnExitApplicationNotification::~OnExitApplicationNotification() {
 }
 
 void OnExitApplicationNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnExitApplicationNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl* app_mgr = ApplicationManagerImpl::instance();
   ApplicationSharedPtr app_impl = app_mgr->application(
diff --git a/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc b/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc
index f1a590ee04..83c3e61a0c 100644
--- a/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ OnFileRemovedNotification::~OnFileRemovedNotification() {
 }
 
 void OnFileRemovedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnFileRemovedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendNotification();
 }
diff --git a/src/components/application_manager/src/commands/hmi/on_find_applications.cc b/src/components/application_manager/src/commands/hmi/on_find_applications.cc
index bc32ab1cf0..fc1b72c73a 100644
--- a/src/components/application_manager/src/commands/hmi/on_find_applications.cc
+++ b/src/components/application_manager/src/commands/hmi/on_find_applications.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ OnFindApplications::~OnFindApplications() {
 }
 
 void OnFindApplications::Run() {
-  LOG4CXX_INFO(logger_, "OnFindApplications::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // TODO(PV): add UpdateAppsOnDevice to ApplicationManager
 }
diff --git a/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc b/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc
index 523013734f..32babf05cc 100644
--- a/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnIgnitionCycleOverNotification::~OnIgnitionCycleOverNotification() {
 }
 
 void OnIgnitionCycleOverNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnIgnitionCycleOverNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   policy::PolicyHandler::instance()->OnIgnitionCycleOver();
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc b/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc
index a68ae90796..87db5d4a38 100644
--- a/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnNaviTBTClientStateNotification::~OnNaviTBTClientStateNotification() {
 }
 
 void OnNaviTBTClientStateNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnNaviTBTClientStateNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc b/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc
index 9bd9099c75..9cee8801e7 100644
--- a/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -50,7 +50,7 @@ OnPhoneCallNotification::~OnPhoneCallNotification() {
 }
 
 void OnPhoneCallNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnPhoneCallNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   bool is_active =
       (*message_)[strings::msg_params][hmi_notification::is_active].asBool();
diff --git a/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc b/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc
index e05b38d456..9820bb02ad 100644
--- a/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ OnPlayToneNotification::~OnPlayToneNotification() {
 }
 
 void OnPlayToneNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnPlayToneNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendNotification();
 }
diff --git a/src/components/application_manager/src/commands/hmi/on_policy_update.cc b/src/components/application_manager/src/commands/hmi/on_policy_update.cc
index b3f5803d44..56c544888a 100644
--- a/src/components/application_manager/src/commands/hmi/on_policy_update.cc
+++ b/src/components/application_manager/src/commands/hmi/on_policy_update.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ OnPolicyUpdate::~OnPolicyUpdate() {
 }
 
 void OnPolicyUpdate::Run() {
-  LOG4CXX_INFO(logger_, "OnPolicyUpdate::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   policy::PolicyHandler::instance()->OnPTExchangeNeeded();
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc b/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc
index 2fecbec9c7..cf0297df01 100644
--- a/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnPutFileNotification::~OnPutFileNotification() {
 }
 
 void OnPutFileNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnPutFileNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   SendNotification();
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/on_ready_notification.cc b/src/components/application_manager/src/commands/hmi/on_ready_notification.cc
index 783aa4af40..f1ac8b6d3c 100644
--- a/src/components/application_manager/src/commands/hmi/on_ready_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_ready_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ OnReadyNotification::~OnReadyNotification() {
 }
 
 void OnReadyNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnReadyNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->OnHMIStartedCooperation();
   event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnReady);
diff --git a/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc b/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc
index 1e517f35de..a5ea29c6d2 100644
--- a/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc
+++ b/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ OnReceivedPolicyUpdate::~OnReceivedPolicyUpdate() {
 }
 
 void OnReceivedPolicyUpdate::Run() {
-  LOG4CXX_INFO(logger_, "OnReceivedPolicyUpdate::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   const std::string& file_path =
     (*message_)[strings::msg_params][hmi_notification::policyfile].asString();
   policy::BinaryMessage file_content;
diff --git a/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc b/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc
index e0dae8f045..163b525628 100644
--- a/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ OnRecordStartdNotification::~OnRecordStartdNotification() {
 }
 
 void OnRecordStartdNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnRecordStartdNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendNotification();
 }
diff --git a/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc b/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc
index 70868b826f..8e00c3447c 100644
--- a/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnResumeAudioSourceNotification::~OnResumeAudioSourceNotification() {
 }
 
 void OnResumeAudioSourceNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnResumeAudioSourceNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   SendNotification();
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc
index 70240b4bf6..c393219134 100644
--- a/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc
index 1fda4986e4..20010111fd 100644
--- a/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc
@@ -46,7 +46,7 @@ OnSDLConsentNeededNotification::~OnSDLConsentNeededNotification() {
 }
 
 void OnSDLConsentNeededNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnSDLConsentNeededNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   SendNotification();
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc
index d71413ef85..afe0ffeabc 100644
--- a/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc b/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc
index fc5ffed42c..6f867adbcd 100644
--- a/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc
+++ b/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ OnStartDeviceDiscovery::~OnStartDeviceDiscovery() {
 }
 
 void OnStartDeviceDiscovery::Run() {
-  LOG4CXX_INFO(logger_, "OnStartDeviceDiscovery::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->StartDevicesDiscovery();
 }
diff --git a/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc b/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc
index 6e4e65987e..7db0053e2d 100644
--- a/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc
index 5a5c12b907..8dbd1e13e4 100644
--- a/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ OnSystemContextNotification::~OnSystemContextNotification() {
 }
 
 void OnSystemContextNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnSystemContextNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   mobile_api::SystemContext::eType system_context =
     static_cast<mobile_api::SystemContext::eType>(
diff --git a/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc
index bac3d37359..09a96cc797 100644
--- a/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ OnSystemErrorNotification::~OnSystemErrorNotification() {
 }
 
 void OnSystemErrorNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnSystemErrorNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   int code = (*message_)[strings::msg_params][hmi_notification::error]
       .asInt();
diff --git a/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc
index ec8460d581..fb5a9abc43 100644
--- a/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ OnSystemInfoChangedNotification::~OnSystemInfoChangedNotification() {
 }
 
 void OnSystemInfoChangedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnSystemInfoChangedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t lang_code =
       (*message_)[strings::msg_params][strings::language].asUInt();
   const std::string language =
diff --git a/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc
index e3d0ea511d..a77bd24766 100644
--- a/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -52,7 +52,7 @@ OnSystemRequestNotification::~OnSystemRequestNotification() {
 }
 
 void OnSystemRequestNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnSystemRequestNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   smart_objects::SmartObject& params = (*message_)[strings::params];
   smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params];
@@ -60,7 +60,8 @@ void OnSystemRequestNotification::Run() {
   params[strings::function_id] =
     static_cast<int32_t>(mobile_apis::FunctionID::eType::OnSystemRequestID);
 
-  std::string app_id = msg_params[strings::app_id].asString();
+  const std::string app_id = msg_params[strings::app_id].asString();
+  LOG4CXX_DEBUG(logger_, "Received OnSystemRequest for " << app_id );
 
   if (strings::default_app_id == app_id) {
     PolicyHandler* policy_handler = PolicyHandler::instance();
@@ -81,7 +82,8 @@ void OnSystemRequestNotification::Run() {
     ApplicationSharedPtr app =
       ApplicationManagerImpl::instance()->application_by_policy_id(app_id);
     if (!app.valid()) {
-      LOG4CXX_WARN(logger_, "Application with such id is not yet registered.");
+      LOG4CXX_WARN(logger_, "Application with id " << app_id
+                   << " is not registered.");
       return;
     }
     params[strings::connection_key] = app->app_id();
diff --git a/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc
index 60c0dca10a..f3fbeb4e6f 100644
--- a/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -49,7 +49,7 @@ OnTTSLanguageChangeNotification::~OnTTSLanguageChangeNotification() {
 }
 
 void OnTTSLanguageChangeNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnTTSLanguageChangeNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc
index 047a5d985d..96089384c4 100644
--- a/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc
@@ -16,7 +16,7 @@ OnTTSResetTimeoutNotification::~OnTTSResetTimeoutNotification() {
 }
 
 void OnTTSResetTimeoutNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnTTSResetTimeoutNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::TTS_OnResetTimeout);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc
index 519fc290d9..8213474c09 100644
--- a/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnTTSStartedNotification::~OnTTSStartedNotification() {
 }
 
 void OnTTSStartedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnTTSStartedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->Mute(kTTSSessionChanging);
 }
diff --git a/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc
index b3e3683f32..c812c84af5 100644
--- a/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ OnTTSStoppedNotification::~OnTTSStoppedNotification() {
 }
 
 void OnTTSStoppedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnTTSStoppedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::TTS_Stopped);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc
index 4ed5839e5f..d8fe1ebdea 100644
--- a/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnUICommandNotification::~OnUICommandNotification() {
 }
 
 void OnUICommandNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnUICommandNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   (*message_)[strings::params][strings::function_id] =
       static_cast<int32_t>(mobile_apis::FunctionID::eType::OnCommandID);
diff --git a/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc
index 45ff7425b7..9dcfe01e60 100644
--- a/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ OnUIKeyBoardInputNotification::~OnUIKeyBoardInputNotification() {
 }
 
 void OnUIKeyBoardInputNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnUIKeyBoardInputNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   //prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc
index 5756f50eb5..c8408b2e46 100644
--- a/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -49,7 +49,7 @@ OnUILanguageChangeNotification::~OnUILanguageChangeNotification() {
 }
 
 void OnUILanguageChangeNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnUILanguageChangeNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc
index 357bfc4cb3..96f65839c1 100644
--- a/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -48,7 +48,7 @@ OnUIResetTimeoutNotification::~OnUIResetTimeoutNotification() {
 }
 
 void OnUIResetTimeoutNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnUIResetTimeoutNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_OnResetTimeout);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc
index 7868e81193..00e0e4d2c6 100644
--- a/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ OnUITouchEventNotification::~OnUITouchEventNotification() {
 }
 
 void OnUITouchEventNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnUITouchEventNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   //prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_update_device_list.cc b/src/components/application_manager/src/commands/hmi/on_update_device_list.cc
index a5b84748ef..8716fb4165 100644
--- a/src/components/application_manager/src/commands/hmi/on_update_device_list.cc
+++ b/src/components/application_manager/src/commands/hmi/on_update_device_list.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ OnUpdateDeviceList::~OnUpdateDeviceList() {
 }
 
 void OnUpdateDeviceList::Run() {
-  LOG4CXX_INFO(logger_, "OnUpdateDeviceList::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc
index be0c4ebb60..f1e515e2f2 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIAccPedalPositionNotification::~OnVIAccPedalPositionNotification() {
 }
 
 void OnVIAccPedalPositionNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIAccPedalPositionNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc
index 688a5c1fb1..0dd5361f74 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIBeltStatusNotification::~OnVIBeltStatusNotification() {
 }
 
 void OnVIBeltStatusNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIBeltStatusNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc
index e80a2edcf3..27c902c880 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIBodyInformationNotification::~OnVIBodyInformationNotification() {
 }
 
 void OnVIBodyInformationNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIBodyInformationNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc
index 4669398da1..07b96f1011 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIDeviceStatusNotification::~OnVIDeviceStatusNotification() {
 }
 
 void OnVIDeviceStatusNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIDeviceStatusNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc
index 8b61d0af21..57a8f9c6ef 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIDriverBrakingNotification::~OnVIDriverBrakingNotification() {
 }
 
 void OnVIDriverBrakingNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIDriverBrakingNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc
index 1b0989b1ec..7509884497 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIEngineTorqueNotification::~OnVIEngineTorqueNotification() {
 }
 
 void OnVIEngineTorqueNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIEngineTorqueNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc
index f7a9213598..64dd411bdd 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIExternalTemperatureNotification::~OnVIExternalTemperatureNotification() {
 }
 
 void OnVIExternalTemperatureNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIExternalTemperatureNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc
index 97d797b630..59ecab0abc 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIFuelLevelNotification::~OnVIFuelLevelNotification() {
 }
 
 void OnVIFuelLevelNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIFuelLevelNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc
index 0024f17a80..faa8a0522a 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIFuelLevelStateNotification::~OnVIFuelLevelStateNotification() {
 }
 
 void OnVIFuelLevelStateNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIFuelLevelStateNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc
index 5b7ec72977..df582418cb 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIGpsDataNotification::~OnVIGpsDataNotification() {
 }
 
 void OnVIGpsDataNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIGpsDataNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc
index 355c00f0c9..01a0a725ef 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIHeadLampStatusNotification::~OnVIHeadLampStatusNotification() {
 }
 
 void OnVIHeadLampStatusNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIHeadLampStatusNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc
index 17240bce6c..b13d50fc1c 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIInstantFuelConsumptionNotification::~OnVIInstantFuelConsumptionNotification(
 }
 
 void OnVIInstantFuelConsumptionNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIInstantFuelConsumptionNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc
index 1caaecb442..71870522ce 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIMyKeyNotification::~OnVIMyKeyNotification() {
 }
 
 void OnVIMyKeyNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIMyKeyNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc
index 02127a1389..5db3ef3bb3 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIOdometerNotification::~OnVIOdometerNotification() {
 }
 
 void OnVIOdometerNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIOdometerNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc
index 4692191cb3..1739f4809b 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIPrndlNotification::~OnVIPrndlNotification() {
 }
 
 void OnVIPrndlNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIPrndlNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc
index b16421903a..336847ced0 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIRpmNotification::~OnVIRpmNotification() {
 }
 
 void OnVIRpmNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIRpmNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc
index 6bc1e8b2cf..ad38bf50a5 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVISpeedNotification::~OnVISpeedNotification() {
 }
 
 void OnVISpeedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVISpeedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc
index 853b4eeea3..4fd70bf169 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVISteeringWheelAngleNotification::~OnVISteeringWheelAngleNotification() {
 }
 
 void OnVISteeringWheelAngleNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVISteeringWheelAngleNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc
index 01ac7e9f8c..fda6e6e28d 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVITirePressureNotification::~OnVITirePressureNotification() {
 }
 
 void OnVITirePressureNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVITirePressureNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc
index eda88ef602..15ccf940b8 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIVehicleDataNotification::~OnVIVehicleDataNotification() {
 }
 
 void OnVIVehicleDataNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIVehicleDataNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc
index 546dc0d3cf..aa1683c5fb 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIVinNotification::~OnVIVinNotification() {
 }
 
 void OnVIVinNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIVinNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc
index 101427df0a..0d27f42388 100644
--- a/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVIWiperStatusNotification::~OnVIWiperStatusNotification() {
 }
 
 void OnVIWiperStatusNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVIWiperStatusNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // prepare SmartObject for mobile factory
   (*message_)[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc
index 99842b8524..bcd02196a8 100644
--- a/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -51,7 +51,7 @@ OnVRCommandNotification::~OnVRCommandNotification() {
 }
 
 void OnVRCommandNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVRCommandNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr active_app = ApplicationManagerImpl::instance()
       ->active_application();
diff --git a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc
index 92e7cb7b23..c7de53b780 100644
--- a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -49,7 +49,7 @@ OnVRLanguageChangeNotification::~OnVRLanguageChangeNotification() {
 }
 
 void OnVRLanguageChangeNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVRLanguageChangeNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc
index 72f6767e8c..6e56dd29c0 100644
--- a/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVRStartedNotification::~OnVRStartedNotification() {
 }
 
 void OnVRStartedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVRStartedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->set_vr_session_started(true);
   ApplicationManagerImpl::instance()->Mute(kVRSessionChanging);
diff --git a/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc
index 46274a3b2e..442968ea1e 100644
--- a/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ OnVRStoppedNotification::~OnVRStoppedNotification() {
 }
 
 void OnVRStoppedNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVRStoppedNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->set_vr_session_started(false);
   ApplicationManagerImpl::instance()->Unmute(kVRSessionChanging);
diff --git a/src/components/application_manager/src/commands/hmi/request_to_hmi.cc b/src/components/application_manager/src/commands/hmi/request_to_hmi.cc
index 242118a417..82b36be0f0 100644
--- a/src/components/application_manager/src/commands/hmi/request_to_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/request_to_hmi.cc
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
index 72abf233ce..0b8a190c3e 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ SDLActivateAppRequest::~SDLActivateAppRequest() {
 }
 
 void SDLActivateAppRequest::Run() {
-  LOG4CXX_INFO(logger_, "SDLActivateAppRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   policy::PolicyHandler::instance()->OnActivateApp(
       (*message_)[strings::msg_params][strings::app_id].asUInt(),
       (*message_)[strings::params][strings::correlation_id].asInt());
diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc
index 46eb402f41..6c7a0b5355 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ SDLActivateAppResponse::~SDLActivateAppResponse() {
 }
 
 void SDLActivateAppResponse::Run() {
-  LOG4CXX_INFO(logger_, "SDLActivateAppResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc
index 7eb5a268ac..a6649b2579 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ SDLGetListOfPermissionsRequest::~SDLGetListOfPermissionsRequest() {
 }
 
 void SDLGetListOfPermissionsRequest::Run() {
-  LOG4CXX_INFO(logger_, "SDLGetListOfPermissionsRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t connection_key = 0;
   if ((*message_)[strings::msg_params].keyExists(strings::app_id)) {
     connection_key = (*message_)[strings::msg_params][strings::app_id].asUInt();
diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc
index da474cb128..5d5e75e5c7 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ SDLGetListOfPermissionsResponse::~SDLGetListOfPermissionsResponse() {
 }
 
 void SDLGetListOfPermissionsResponse::Run() {
-  LOG4CXX_INFO(logger_, "SDLGetListOfPermissionsResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc
index cc5fbc63ae..dd977d99f0 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ SDLGetStatusUpdateRequest::~SDLGetStatusUpdateRequest() {
 }
 
 void SDLGetStatusUpdateRequest::Run() {
-  LOG4CXX_INFO(logger_, "SDLGetStatusUpdateRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   policy::PolicyHandler::instance()->OnGetStatusUpdate(
         (*message_)[strings::params][strings::correlation_id].asUInt());
 }
diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc
index 08d8d315a5..ab1c57e9af 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ SDLGetStatusUpdateResponse::~SDLGetStatusUpdateResponse() {
 }
 
 void SDLGetStatusUpdateResponse::Run() {
-  LOG4CXX_INFO(logger_, "SDLGetStatusUpdateResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc
index 047d6bf846..cdd5c16ed0 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -48,7 +48,7 @@ SDLGetUserFriendlyMessageRequest::~SDLGetUserFriendlyMessageRequest() {
 }
 
 void SDLGetUserFriendlyMessageRequest::Run() {
-  LOG4CXX_INFO(logger_, "SDLGetUserFriendlyMessageRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   const std::string messageCodes = "messageCodes";
   if (!(*message_)[strings::msg_params].keyExists(messageCodes)) {
     LOG4CXX_WARN(logger_,
diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc
index c849204cc3..8cc1b2d629 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ SDLGetUserFriendlyMessageResponse::~SDLGetUserFriendlyMessageResponse() {
 }
 
 void SDLGetUserFriendlyMessageResponse::Run() {
-  LOG4CXX_INFO(logger_, "SDLGetUserFriendlyMessageResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
diff --git a/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc b/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc
index 4779e106c5..b9c5aaa086 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ SDLPolicyUpdate::~SDLPolicyUpdate() {
 }
 
 void SDLPolicyUpdate::Run() {
-  LOG4CXX_INFO(logger_, "SDLPolicyUpdate::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   SendRequest();
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc b/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc
index a3db3a9047..bc7c6e0d74 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -43,7 +43,7 @@ SDLPolicyUpdateResponse::~SDLPolicyUpdateResponse() {
 }
 
 void SDLPolicyUpdateResponse::Run() {
-  LOG4CXX_INFO(logger_, "SDLPolicyUpdateResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   // TODO(PV): add some logic here
 }
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc b/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc
index 638503d162..dd127ec43f 100644
--- a/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ TTSChangeRegistrationRequest::~TTSChangeRegistrationRequest() {
 }
 
 void TTSChangeRegistrationRequest::Run() {
-  LOG4CXX_INFO(logger_, "TTSChangeRegistrationRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc
index 67e48b4ed5..03b51e5db7 100644
--- a/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ TTSChangeRegistratioResponse::~TTSChangeRegistratioResponse() {
 }
 
 void TTSChangeRegistratioResponse::Run() {
-  LOG4CXX_INFO(logger_, "TTSChangeRegistratioResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::TTS_ChangeRegistration);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc
index 59cf50b38d..fb3dedc1c0 100644
--- a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ TTSGetCapabilitiesRequest::~TTSGetCapabilitiesRequest() {
 }
 
 void TTSGetCapabilitiesRequest::Run() {
-  LOG4CXX_INFO(logger_, "TTSGetCapabilitiesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc
index f7309822d8..53a1bd3916 100644
--- a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ TTSGetCapabilitiesResponse::~TTSGetCapabilitiesResponse() {
 }
 
 void TTSGetCapabilitiesResponse::Run() {
-  LOG4CXX_INFO(logger_, "TTSGetCapabilitiesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc
index 9f2fe7134a..6d4e4f465a 100644
--- a/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ TTSGetLanguageRequest::~TTSGetLanguageRequest() {
 }
 
 void TTSGetLanguageRequest::Run() {
-  LOG4CXX_INFO(logger_, "TTSGetLanguageRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc b/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc
index e26fa87739..6c2122557b 100644
--- a/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ TTSGetLanguageResponse::~TTSGetLanguageResponse() {
 }
 
 void TTSGetLanguageResponse::Run() {
-  LOG4CXX_INFO(logger_, "TTSGetLanguageResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc
index 08c1d82448..5251832bc1 100644
--- a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ TTSGetSupportedLanguagesRequest::~TTSGetSupportedLanguagesRequest() {
 }
 
 void TTSGetSupportedLanguagesRequest::Run() {
-  LOG4CXX_INFO(logger_, "TTSGetSupportedLanguagesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc
index aa041f66b3..a5d022a6cb 100644
--- a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ TTSGetSupportedLanguagesResponse::~TTSGetSupportedLanguagesResponse() {
 }
 
 void TTSGetSupportedLanguagesResponse::Run() {
-  LOG4CXX_INFO(logger_, "TTSGetSupportedLanguagesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const hmi_apis::Common_Result::eType code =
       static_cast<hmi_apis::Common_Result::eType>(
diff --git a/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc
index 7733de4887..3a50cfef90 100644
--- a/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ TTSIsReadyRequest::~TTSIsReadyRequest() {
 }
 
 void TTSIsReadyRequest::Run() {
-  LOG4CXX_INFO(logger_, "TTSIsReadyRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc
index fb3cb4858f..dd8eab7534 100644
--- a/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ TTSIsReadyResponse::~TTSIsReadyResponse() {
 }
 
 void TTSIsReadyResponse::Run() {
-  LOG4CXX_INFO(logger_, "TTSIsReadyResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject& object = *message_;
 
   bool is_available = false;
diff --git a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc
index 04f1380d91..ce330c355f 100644
--- a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ TTSSetGlobalPropertiesRequest::~TTSSetGlobalPropertiesRequest() {
 }
 
 void TTSSetGlobalPropertiesRequest::Run() {
-  LOG4CXX_INFO(logger_, "TTSSetGlobalPropertiesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc
index c90655186f..70dc46d6a6 100644
--- a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ TTSSetGlobalPropertiesResponse::~TTSSetGlobalPropertiesResponse() {
 }
 
 void TTSSetGlobalPropertiesResponse::Run() {
-  LOG4CXX_INFO(logger_, "TTSSetGlobalPropertiesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::TTS_SetGlobalProperties);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/tts_speak_request.cc b/src/components/application_manager/src/commands/hmi/tts_speak_request.cc
index 9b4bd68585..79fbde2c4f 100644
--- a/src/components/application_manager/src/commands/hmi/tts_speak_request.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_speak_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ TTSSpeakRequest::~TTSSpeakRequest() {
 }
 
 void TTSSpeakRequest::Run() {
-  LOG4CXX_INFO(logger_, "TTSSpeakRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/tts_speak_response.cc b/src/components/application_manager/src/commands/hmi/tts_speak_response.cc
index 9b9e43dbe8..ff60115e70 100644
--- a/src/components/application_manager/src/commands/hmi/tts_speak_response.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_speak_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ TTSSpeakResponse::~TTSSpeakResponse() {
 }
 
 void TTSSpeakResponse::Run() {
-  LOG4CXX_INFO(logger_, "TTSSpeakResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::TTS_Speak);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc
index 107cb7933b..32aaec27e7 100644
--- a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ TTSStopSpeakingRequest::~TTSStopSpeakingRequest() {
 }
 
 void TTSStopSpeakingRequest::Run() {
-  LOG4CXX_INFO(logger_, "TTSStopSpeakingRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc
index 9bd4f89660..b32cf52bb5 100644
--- a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ TTSStopSpeakingResponse::~TTSStopSpeakingResponse() {
 }
 
 void TTSStopSpeakingResponse::Run() {
-  LOG4CXX_INFO(logger_, "TTSStopSpeakingResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::TTS_StopSpeaking);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc b/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc
index 9aa5d2e2d3..ed9f7979a1 100644
--- a/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UIAddCommandRequest::~UIAddCommandRequest() {
 }
 
 void UIAddCommandRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIAddCommandRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc b/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc
index 21b34e0637..13b2ab1b2b 100644
--- a/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIAddCommandResponse::~UIAddCommandResponse() {
 }
 
 void UIAddCommandResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIAddCommandResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_AddCommand);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc b/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc
index 7a9c5c6fed..667499584f 100644
--- a/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc b/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc
index af88de2b48..54247dbbce 100644
--- a/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIAddSubmenuResponse::~UIAddSubmenuResponse() {
 }
 
 void UIAddSubmenuResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIAddSubmenuResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_AddSubMenu);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_alert_request.cc b/src/components/application_manager/src/commands/hmi/ui_alert_request.cc
index f8c9ed5708..c706d5fdba 100644
--- a/src/components/application_manager/src/commands/hmi/ui_alert_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_alert_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UIAlertRequest::~UIAlertRequest() {
 }
 
 void UIAlertRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIAlertRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_alert_response.cc b/src/components/application_manager/src/commands/hmi/ui_alert_response.cc
index 289b90d290..8c9ddef7ac 100644
--- a/src/components/application_manager/src/commands/hmi/ui_alert_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_alert_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIAlertResponse::~UIAlertResponse() {
 }
 
 void UIAlertResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIAlertResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_Alert);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc b/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc
index fbba2b4023..67c9be6cb5 100644
--- a/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIChangeRegistrationRequest::~UIChangeRegistrationRequest() {
 }
 
 void UIChangeRegistrationRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIChangeRegistrationRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc
index 16447077dd..1d59d66d74 100644
--- a/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UIChangeRegistratioResponse::~UIChangeRegistratioResponse() {
 }
 
 void UIChangeRegistratioResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIChangeRegistratioResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_ChangeRegistration);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc b/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc
index 23fb4c67f5..7d5532f30f 100644
--- a/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UIDeleteCommandRequest::~UIDeleteCommandRequest() {
 }
 
 void UIDeleteCommandRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIDeleteCommandRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc b/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc
index 0ac32877c4..2fb94a63a3 100644
--- a/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UIDeleteCommandResponse::~UIDeleteCommandResponse() {
 }
 
 void UIDeleteCommandResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIDeleteCommandResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_DeleteCommand);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc
index 41f356b981..e945139639 100644
--- a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UIDeleteSubmenuRequest::~UIDeleteSubmenuRequest() {
 }
 
 void UIDeleteSubmenuRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIDeleteSubmenuRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc
index 5a3359b722..89a5a19a0b 100644
--- a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UIDeleteSubmenuResponse::~UIDeleteSubmenuResponse() {
 }
 
 void UIDeleteSubmenuResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIDeleteSubmenuResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_DeleteSubMenu);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc
index 4c93f9235b..b87e1d89b8 100644
--- a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIEndAudioPassThruRequest::~UIEndAudioPassThruRequest() {
 }
 
 void UIEndAudioPassThruRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIEndAudioPassThruRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc
index e560ae293a..8f5d92b78f 100644
--- a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UIEndAudioPassThruResponse::~UIEndAudioPassThruResponse() {
 }
 
 void UIEndAudioPassThruResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIEndAudioPassThruResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_EndAudioPassThru);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc
index b9f1b6917c..74ee67e884 100644
--- a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIGetCapabilitiesRequest::~UIGetCapabilitiesRequest() {
 }
 
 void UIGetCapabilitiesRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIGetCapabilitiesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc
index 0663bf033e..7ebc5ffcc9 100644
--- a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIGetCapabilitiesResponse::~UIGetCapabilitiesResponse() {
 }
 
 void UIGetCapabilitiesResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIGetCapabilitiesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc
index ffca242d43..1b22a9b58f 100644
--- a/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UIGetLanguageRequest::~UIGetLanguageRequest() {
 }
 
 void UIGetLanguageRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIGetLanguageRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc
index 20435d788b..cba85d91e7 100644
--- a/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIGetLanguageResponse::~UIGetLanguageResponse() {
 }
 
 void UIGetLanguageResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIGetLanguageResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc
index 455486ef6c..5cd0c09e65 100644
--- a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIGetSupportedLanguagesRequest::~UIGetSupportedLanguagesRequest() {
 }
 
 void UIGetSupportedLanguagesRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIGetSupportedLanguagesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc
index 8492cfca5b..2057f3cbb2 100644
--- a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UIGetSupportedLanguagesResponse::~UIGetSupportedLanguagesResponse() {
 }
 
 void UIGetSupportedLanguagesResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIGetSupportedLanguagesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const hmi_apis::Common_Result::eType code =
       static_cast<hmi_apis::Common_Result::eType>(
diff --git a/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc
index 50d0ddd95a..94df3cec7d 100644
--- a/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UIIsReadyRequest::~UIIsReadyRequest() {
 }
 
 void UIIsReadyRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIIsReadyRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc
index 97d11b6022..9edf77080e 100644
--- a/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UIIsReadyResponse::~UIIsReadyResponse() {
 }
 
 void UIIsReadyResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIIsReadyResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject& object = *message_;
 
   bool is_available = false;
diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc
index cf77703a9b..3cf7722b24 100644
--- a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIPerformAudioPassThruRequest::~UIPerformAudioPassThruRequest() {
 }
 
 void UIPerformAudioPassThruRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIPerformAudioPassThruRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc
index 36d4c507b5..c8a488e44d 100644
--- a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UIPerformAudioPassThruResponse::~UIPerformAudioPassThruResponse() {
 }
 
 void UIPerformAudioPassThruResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIPerformAudioPassThruResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_PerformAudioPassThru);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc
index 09f98ec036..2b1f5ce484 100644
--- a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIPerformInteractionRequest::~UIPerformInteractionRequest() {
 }
 
 void UIPerformInteractionRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIPerformInteractionRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc
index 2f5f6ead57..25237525da 100644
--- a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UIPerformInteractionResponse::~UIPerformInteractionResponse() {
 }
 
 void UIPerformInteractionResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIPerformInteractionResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   event_engine::Event event(hmi_apis::FunctionID::UI_PerformInteraction);
   event.set_smart_object(*message_);
   event.raise();
diff --git a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc
index ac34dd236f..911c840ce4 100644
--- a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UIScrollableMessageRequest::~UIScrollableMessageRequest() {
 }
 
 void UIScrollableMessageRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIScrollableMessageRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc
index 182d512c8c..58c793c3b6 100644
--- a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UIScrollableMessageResponse::~UIScrollableMessageResponse() {
 }
 
 void UIScrollableMessageResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIScrollableMessageResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_ScrollableMessage);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc
index 3dea853486..df9f6cf2a6 100644
--- a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UiSetDisplayLayoutRequest::~UiSetDisplayLayoutRequest() {
 }
 
 void UiSetDisplayLayoutRequest::Run() {
-  LOG4CXX_INFO(logger_, "UiSetDisplayLayoutRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   SendRequest();
 }
 
diff --git a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc
index f381a4db28..f23cc92642 100644
--- a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UiSetDisplayLayoutResponse::~UiSetDisplayLayoutResponse() {
 }
 
 void UiSetDisplayLayoutResponse::Run() {
-  LOG4CXX_INFO(logger_, "UiSetDisplayLayoutResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_SetDisplayLayout);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc
index e538866c1b..39a0e865df 100644
--- a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UISetGlobalPropertiesRequest::~UISetGlobalPropertiesRequest() {
 }
 
 void UISetGlobalPropertiesRequest::Run() {
-  LOG4CXX_INFO(logger_, "UISetGlobalPropertiesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc
index 67023533c9..23173961fb 100644
--- a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UISetGlobalPropertiesResponse::~UISetGlobalPropertiesResponse() {
 }
 
 void UISetGlobalPropertiesResponse::Run() {
-  LOG4CXX_INFO(logger_, "UISetGlobalPropertiesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_SetGlobalProperties);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc
index b587a3028e..6cb4af4d47 100644
--- a/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UISetIconRequest::~UISetIconRequest() {
 }
 
 void UISetIconRequest::Run() {
-  LOG4CXX_INFO(logger_, "UISetIconRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc
index f4565baaf1..44a40965a6 100644
--- a/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UISetIconResponse::~UISetIconResponse() {
 }
 
 void UISetIconResponse::Run() {
-  LOG4CXX_INFO(logger_, "UISetIconResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_SetAppIcon);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc
index 1eb218013b..272ff561aa 100644
--- a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UISetMediaClockTimerRequest::~UISetMediaClockTimerRequest() {
 }
 
 void UISetMediaClockTimerRequest::Run() {
-  LOG4CXX_INFO(logger_, "UISetMediaClockTimerRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc
index ee67862a1a..ae878bd694 100644
--- a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ UISetMediaClockTimerResponse::~UISetMediaClockTimerResponse() {
 }
 
 void UISetMediaClockTimerResponse::Run() {
-  LOG4CXX_INFO(logger_, "UISetMediaClockTimerResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_SetMediaClockTimer);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_show_request.cc b/src/components/application_manager/src/commands/hmi/ui_show_request.cc
index 841c8a62fa..65b9894902 100644
--- a/src/components/application_manager/src/commands/hmi/ui_show_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_show_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UIShowRequest::~UIShowRequest() {
 }
 
 void UIShowRequest::Run() {
-  LOG4CXX_INFO(logger_, "UIShowRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_show_response.cc b/src/components/application_manager/src/commands/hmi/ui_show_response.cc
index c95cbbd2ba..8d348e6086 100644
--- a/src/components/application_manager/src/commands/hmi/ui_show_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_show_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UIShowResponse::~UIShowResponse() {
 }
 
 void UIShowResponse::Run() {
-  LOG4CXX_INFO(logger_, "UIShowResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_Show);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/ui_slider_request.cc b/src/components/application_manager/src/commands/hmi/ui_slider_request.cc
index fc7203c0ea..c8d3242d98 100644
--- a/src/components/application_manager/src/commands/hmi/ui_slider_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_slider_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UISliderRequest::~UISliderRequest() {
 }
 
 void UISliderRequest::Run() {
-  LOG4CXX_INFO(logger_, "UISliderRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/ui_slider_response.cc b/src/components/application_manager/src/commands/hmi/ui_slider_response.cc
index 8d2522e224..7837117ebd 100644
--- a/src/components/application_manager/src/commands/hmi/ui_slider_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_slider_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ UISliderResponse::~UISliderResponse() {
 }
 
 void UISliderResponse::Run() {
-  LOG4CXX_INFO(logger_, "UISliderResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::UI_Slider);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/update_app_list_request.cc b/src/components/application_manager/src/commands/hmi/update_app_list_request.cc
index 955f4b19c6..72f65d1a2e 100644
--- a/src/components/application_manager/src/commands/hmi/update_app_list_request.cc
+++ b/src/components/application_manager/src/commands/hmi/update_app_list_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UpdateAppListRequest::~UpdateAppListRequest() {
 }
 
 void UpdateAppListRequest::Run() {
-  LOG4CXX_INFO(logger_, "UpdateAppListRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/update_app_list_response.cc b/src/components/application_manager/src/commands/hmi/update_app_list_response.cc
index d5db0b4ea8..308bce3ad2 100644
--- a/src/components/application_manager/src/commands/hmi/update_app_list_response.cc
+++ b/src/components/application_manager/src/commands/hmi/update_app_list_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UpdateAppListResponse::~UpdateAppListResponse() {
 }
 
 void UpdateAppListResponse::Run() {
-  LOG4CXX_INFO(logger_, "UpdateAppListResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // TODO(PV): add check
 }
diff --git a/src/components/application_manager/src/commands/hmi/update_device_list_request.cc b/src/components/application_manager/src/commands/hmi/update_device_list_request.cc
index 1f632378b4..696e2f85c4 100644
--- a/src/components/application_manager/src/commands/hmi/update_device_list_request.cc
+++ b/src/components/application_manager/src/commands/hmi/update_device_list_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -50,17 +50,17 @@ UpdateDeviceListRequest::~UpdateDeviceListRequest() {
 }
 
 void UpdateDeviceListRequest::Run() {
-  LOG4CXX_INFO(logger_, "UpdateDeviceListRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock auto_lock(wait_hmi_lock);
   // Fix problem with SDL and HMI HTML. This problem is not actual for HMI PASA.
-  // Flag conditional compilation "CUSTOMER_PASA" is used in order to exclude
+  // Flag conditional compilation for specific customer is used in order to exclude
   // hit code to RTC
   if (true == profile::Profile::instance()->launch_hmi()) {
     if (!ApplicationManagerImpl::instance()->IsHMICooperating()) {
-      LOG4CXX_INFO(logger_, "MY Wait for HMI Cooperation");
+      LOG4CXX_INFO(logger_, "Wait for HMI Cooperation");
       subscribe_on_event(hmi_apis::FunctionID::BasicCommunication_OnReady);
       termination_condition_.Wait(auto_lock);
-      LOG4CXX_INFO(logger_, "MY HMI Cooperation OK");
+      LOG4CXX_DEBUG(logger_, "HMI Cooperation OK");
     }
   }
 
@@ -68,7 +68,7 @@ void UpdateDeviceListRequest::Run() {
 }
 
 void UpdateDeviceListRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "UpdateDeviceListRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock auto_lock(wait_hmi_lock);
   switch (event.id()) {
     case hmi_apis::FunctionID::BasicCommunication_OnReady : {
diff --git a/src/components/application_manager/src/commands/hmi/update_device_list_response.cc b/src/components/application_manager/src/commands/hmi/update_device_list_response.cc
index 85ef57404c..b3e0f9a309 100644
--- a/src/components/application_manager/src/commands/hmi/update_device_list_response.cc
+++ b/src/components/application_manager/src/commands/hmi/update_device_list_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UpdateDeviceListResponse::~UpdateDeviceListResponse() {
 }
 
 void UpdateDeviceListResponse::Run() {
-  LOG4CXX_INFO(logger_, "UpdateDeviceListResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // TODO(PV): add check for correctness.
 }
diff --git a/src/components/application_manager/src/commands/hmi/update_sdl_request.cc b/src/components/application_manager/src/commands/hmi/update_sdl_request.cc
index 7d47f84ce3..b03e595e9c 100644
--- a/src/components/application_manager/src/commands/hmi/update_sdl_request.cc
+++ b/src/components/application_manager/src/commands/hmi/update_sdl_request.cc
@@ -46,7 +46,7 @@ UpdateSDLRequest::~UpdateSDLRequest() {
 }
 
 void UpdateSDLRequest::Run() {
-  LOG4CXX_INFO(logger_, "UpdateSDLRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   policy::PolicyHandler::instance()->PTExchangeAtUserRequest(
       (*message_)[strings::params][strings::correlation_id].asInt());
diff --git a/src/components/application_manager/src/commands/hmi/update_sdl_response.cc b/src/components/application_manager/src/commands/hmi/update_sdl_response.cc
index d2be2c655c..d9c8b6102f 100644
--- a/src/components/application_manager/src/commands/hmi/update_sdl_response.cc
+++ b/src/components/application_manager/src/commands/hmi/update_sdl_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ UpdateSDLResponse::~UpdateSDLResponse() {
 }
 
 void UpdateSDLResponse::Run() {
-  LOG4CXX_INFO(logger_, "UpdateSDLResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
diff --git a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc
index 45d44e4475..eb9a9841be 100644
--- a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ VIDiagnosticMessageRequest::~VIDiagnosticMessageRequest() {
 }
 
 void VIDiagnosticMessageRequest::Run() {
-  LOG4CXX_INFO(logger_, "VIDiagnosticMessageRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc
index d83869b279..4183395e99 100644
--- a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VIDiagnosticMessageResponse::~VIDiagnosticMessageResponse() {
 }
 
 void VIDiagnosticMessageResponse::Run() {
-  LOG4CXX_INFO(logger_, "VIDiagnosticMessageResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_DiagnosticMessage);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc
index 5289816fb5..a89252ada2 100644
--- a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ VIGetDTCsRequest::~VIGetDTCsRequest() {
 }
 
 void VIGetDTCsRequest::Run() {
-  LOG4CXX_INFO(logger_, "VIGetDTCsRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc
index 0cacc51d6c..c44f5213d2 100644
--- a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VIGetDTCsResponse::~VIGetDTCsResponse() {
 }
 
 void VIGetDTCsResponse::Run() {
-  LOG4CXX_INFO(logger_, "VIGetDTCsResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_GetDTCs);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc
index 40b2ca9fed..37d5ede4b0 100644
--- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VIGetVehicleDataRequest::~VIGetVehicleDataRequest() {
 }
 
 void VIGetVehicleDataRequest::Run() {
-  LOG4CXX_INFO(logger_, "VIGetVehicleDataRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc
index 73444a19bd..574d552018 100644
--- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ VIGetVehicleDataResponse::~VIGetVehicleDataResponse() {
 }
 
 void VIGetVehicleDataResponse::Run() {
-  LOG4CXX_INFO(logger_, "VIGetVehicleDataResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject* result_so = new smart_objects::SmartObject(
       smart_objects::SmartType_Map);
   if (!result_so) {
diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc
index 4c46de950e..11dd26dfad 100644
--- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VIGetVehicleTypeRequest::~VIGetVehicleTypeRequest() {
 }
 
 void VIGetVehicleTypeRequest::Run() {
-  LOG4CXX_INFO(logger_, "VIGetVehicleTypeRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc
index 18c0136d12..2b5f6b96be 100644
--- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VIGetVehicleTypeResponse::~VIGetVehicleTypeResponse() {
 }
 
 void VIGetVehicleTypeResponse::Run() {
-  LOG4CXX_INFO(logger_, "VIGetVehicleTypeResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc
index 074d6f6022..aae05e0fcc 100644
--- a/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ VIIsReadyRequest::~VIIsReadyRequest() {
 }
 
 void VIIsReadyRequest::Run() {
-  LOG4CXX_INFO(logger_, "VIIsReadyRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc
index e7c9c180c2..4a79a6d9b9 100644
--- a/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VIIsReadyResponse::~VIIsReadyResponse() {
 }
 
 void VIIsReadyResponse::Run() {
-  LOG4CXX_INFO(logger_, "VIIsReadyResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject& object = *message_;
 
   bool is_available = false;
diff --git a/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc b/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc
index 1485b471c4..92a105dde4 100644
--- a/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ VIReadDIDRequest::~VIReadDIDRequest() {
 }
 
 void VIReadDIDRequest::Run() {
-  LOG4CXX_INFO(logger_, "VIReadDIDRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc b/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc
index ddd9f3c540..675b944272 100644
--- a/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ VIReadDIDResponse::~VIReadDIDResponse() {
 }
 
 void VIReadDIDResponse::Run() {
-  LOG4CXX_INFO(logger_, "VIReadDIDResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_ReadDID);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc
index 38950a2a2b..5ad4daea94 100644
--- a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VISubscribeVehicleDataRequest::~VISubscribeVehicleDataRequest() {
 }
 
 void VISubscribeVehicleDataRequest::Run() {
-  LOG4CXX_INFO(logger_, "VISubscribeVehicleDataRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc
index bd67294fbb..91d9c85382 100644
--- a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VISubscribeVehicleDataResponse::~VISubscribeVehicleDataResponse() {
 }
 
 void VISubscribeVehicleDataResponse::Run() {
-  LOG4CXX_INFO(logger_, "VISubscribeVehicleDataResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   event_engine::Event event(
       hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData
       );
diff --git a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc
index 0af87c2a2e..7c12cbe6f1 100644
--- a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VIUnsubscribeVehicleDataRequest::~VIUnsubscribeVehicleDataRequest() {
 }
 
 void VIUnsubscribeVehicleDataRequest::Run() {
-  LOG4CXX_INFO(logger_, "VIUnsubscribeVehicleDataRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc
index 22231b4a61..124b7dacbd 100644
--- a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VIUnsubscribeVehicleDataResponse::~VIUnsubscribeVehicleDataResponse() {
 }
 
 void VIUnsubscribeVehicleDataResponse::Run() {
-  LOG4CXX_INFO(logger_, "VIUnsubscribeVehicleDataResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   event_engine::Event event(
       hmi_apis::FunctionID::VehicleInfo_UnsubscribeVehicleData
       );
diff --git a/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc b/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc
index a74ece95da..c900df1678 100644
--- a/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ VRAddCommandRequest::~VRAddCommandRequest() {
 }
 
 void VRAddCommandRequest::Run() {
-  LOG4CXX_INFO(logger_, "VRAddCommandRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc b/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc
index 513ccdace2..3d34b5c65a 100644
--- a/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VRAddCommandResponse::~VRAddCommandResponse() {
 }
 
 void VRAddCommandResponse::Run() {
-  LOG4CXX_INFO(logger_, "VRAddCommandResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::VR_AddCommand);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc b/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc
index bd7c1e7841..fe8ee69021 100644
--- a/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VRChangeRegistrationRequest::~VRChangeRegistrationRequest() {
 }
 
 void VRChangeRegistrationRequest::Run() {
-  LOG4CXX_INFO(logger_, "VRChangeRegistrationRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc
index 92a36d23f6..5bd2fb853a 100644
--- a/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc b/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc
index 0241be6308..e3052ae208 100644
--- a/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ VRDeleteCommandRequest::~VRDeleteCommandRequest() {
 }
 
 void VRDeleteCommandRequest::Run() {
-  LOG4CXX_INFO(logger_, "VRDeleteCommandRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc b/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc
index c5a13126b0..8954b1d1b9 100644
--- a/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -46,7 +46,7 @@ VRDeleteCommandResponse::~VRDeleteCommandResponse() {
 }
 
 void VRDeleteCommandResponse::Run() {
-  LOG4CXX_INFO(logger_, "VRDeleteCommandResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   event_engine::Event event(hmi_apis::FunctionID::VR_DeleteCommand);
   event.set_smart_object(*message_);
diff --git a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc
index 8b1d4ae0b4..58d0a4b3e4 100644
--- a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VRGetCapabilitiesRequest::~VRGetCapabilitiesRequest() {
 }
 
 void VRGetCapabilitiesRequest::Run() {
-  LOG4CXX_INFO(logger_, "VRGetCapabilitiesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc
index de6fdd7a93..5ca1d86190 100644
--- a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VRGetCapabilitiesResponse::~VRGetCapabilitiesResponse() {
 }
 
 void VRGetCapabilitiesResponse::Run() {
-  LOG4CXX_INFO(logger_, "VRGetCapabilitiesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc
index 9f4aeb9797..0b98979418 100644
--- a/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ VRGetLanguageRequest::~VRGetLanguageRequest() {
 }
 
 void VRGetLanguageRequest::Run() {
-  LOG4CXX_INFO(logger_, "VRGetLanguageRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc b/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc
index acbd24fbbf..62127bdf9b 100644
--- a/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VRGetLanguageResponse::~VRGetLanguageResponse() {
 }
 
 void VRGetLanguageResponse::Run() {
-  LOG4CXX_INFO(logger_, "VRGetLanguageResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
diff --git a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc
index e43d88430d..aea97da02d 100644
--- a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VRGetSupportedLanguagesRequest::~VRGetSupportedLanguagesRequest() {
 }
 
 void VRGetSupportedLanguagesRequest::Run() {
-  LOG4CXX_INFO(logger_, "VRGetSupportedLanguagesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc
index d2cc148a09..b1ea89a460 100644
--- a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -47,7 +47,7 @@ VRGetSupportedLanguagesResponse::~VRGetSupportedLanguagesResponse() {
 }
 
 void VRGetSupportedLanguagesResponse::Run() {
-  LOG4CXX_INFO(logger_, "VRGetSupportedLanguagesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const hmi_apis::Common_Result::eType code =
       static_cast<hmi_apis::Common_Result::eType>(
diff --git a/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc
index 944cfcbb3c..a5a3a2b62e 100644
--- a/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ VRIsReadyRequest::~VRIsReadyRequest() {
 }
 
 void VRIsReadyRequest::Run() {
-  LOG4CXX_INFO(logger_, "VRIsReadyRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc
index 8cf5e66ee7..a0de7ae33a 100644
--- a/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -44,7 +44,7 @@ VRIsReadyResponse::~VRIsReadyResponse() {
 }
 
 void VRIsReadyResponse::Run() {
-  LOG4CXX_INFO(logger_, "VRIsReadyResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject& object = *message_;
 
   bool is_available = false;
diff --git a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc
index 6de32dc5b5..1791bab57a 100644
--- a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VRPerformInteractionRequest::~VRPerformInteractionRequest() {
 }
 
 void VRPerformInteractionRequest::Run() {
-  LOG4CXX_INFO(logger_, "VRPerformInteractionRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
 }
diff --git a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc
index fea09b9f29..8fc22ce872 100644
--- a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ VRPerformInteractionResponse::~VRPerformInteractionResponse() {
 }
 
 void VRPerformInteractionResponse::Run() {
-  LOG4CXX_INFO(logger_, "VRPerformInteractionResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   event_engine::Event event(hmi_apis::FunctionID::VR_PerformInteraction);
   event.set_smart_object(*message_);
   event.raise();
diff --git a/src/components/application_manager/src/commands/mobile/add_command_request.cc b/src/components/application_manager/src/commands/mobile/add_command_request.cc
index 35cc619895..d68eb20848 100644
--- a/src/components/application_manager/src/commands/mobile/add_command_request.cc
+++ b/src/components/application_manager/src/commands/mobile/add_command_request.cc
@@ -56,13 +56,13 @@ AddCommandRequest::~AddCommandRequest() {
 }
 
 void AddCommandRequest::onTimeOut() {
-  LOG4CXX_INFO(logger_, "AddCommandRequest::onTimeOut");
+  LOG4CXX_AUTO_TRACE(logger_);
   RemoveCommand();
   CommandRequestImpl::onTimeOut();
 }
 
 void AddCommandRequest::Run() {
-  LOG4CXX_INFO(logger_, "AddCommandRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::params][strings::connection_key].asUInt());
@@ -198,7 +198,8 @@ bool AddCommandRequest::CheckCommandName(ApplicationConstSharedPtr app) {
     return false;
   }
 
-  const CommandsMap& commands = app->commands_map();
+  const DataAccessor<CommandsMap> accessor = app->commands_map();
+  const CommandsMap& commands = accessor.GetData();
   CommandsMap::const_iterator i = commands.begin();
   uint32_t saved_parent_id = 0;
   uint32_t parent_id = 0;
@@ -235,7 +236,8 @@ bool AddCommandRequest::CheckCommandVRSynonym(ApplicationConstSharedPtr app) {
     return false;
   }
 
-  const CommandsMap& commands = app->commands_map();
+  const DataAccessor<CommandsMap> accessor = app->commands_map();
+  const CommandsMap& commands = accessor.GetData();
   CommandsMap::const_iterator it = commands.begin();
 
   for (; commands.end() != it; ++it) {
@@ -284,7 +286,7 @@ bool AddCommandRequest::CheckCommandParentId(ApplicationConstSharedPtr app) {
 }
 
 void AddCommandRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "AddCommandRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const smart_objects::SmartObject& message = event.smart_object();
 
@@ -360,7 +362,7 @@ bool AddCommandRequest::IsPendingResponseExist() {
 }
 
 bool AddCommandRequest::IsWhiteSpaceExist() {
-  LOG4CXX_INFO(logger_, "AddCommandRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   if ((*message_)[strings::msg_params].keyExists(strings::menu_params)) {
@@ -398,7 +400,7 @@ bool AddCommandRequest::IsWhiteSpaceExist() {
 }
 
 void AddCommandRequest::RemoveCommand() {
-  LOG4CXX_INFO(logger_, "AddCommandRequest::RemoveCommand");
+  LOG4CXX_AUTO_TRACE(logger_);
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       connection_key());
   if (!app.valid()) {
diff --git a/src/components/application_manager/src/commands/mobile/add_command_response.cc b/src/components/application_manager/src/commands/mobile/add_command_response.cc
index 0c135af076..51684c065b 100644
--- a/src/components/application_manager/src/commands/mobile/add_command_response.cc
+++ b/src/components/application_manager/src/commands/mobile/add_command_response.cc
@@ -46,7 +46,7 @@ AddCommandResponse::~AddCommandResponse() {
 }
 
 void AddCommandResponse::Run() {
-  LOG4CXX_INFO(logger_, "AddCommandResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc
index ce6fa3fc51..7e0e6aeca4 100644
--- a/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc
+++ b/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc
@@ -47,7 +47,7 @@ AddSubMenuRequest::~AddSubMenuRequest() {
 }
 
 void AddSubMenuRequest::Run() {
-  LOG4CXX_INFO(logger_, "AddSubMenuRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::params][strings::connection_key].asUInt());
@@ -95,7 +95,7 @@ void AddSubMenuRequest::Run() {
 }
 
 void AddSubMenuRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "AddSubMenuRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc b/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc
index bcd7df2888..ff37a6a998 100644
--- a/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc
+++ b/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc
@@ -47,7 +47,7 @@ AddSubMenuResponse::~AddSubMenuResponse() {
 }
 
 void AddSubMenuResponse::Run() {
-  LOG4CXX_INFO(logger_, "AddSubMenuResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc b/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc
index abb5bc7f3c..77d2211157 100644
--- a/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc
+++ b/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc
@@ -52,7 +52,7 @@ AlertManeuverRequest::~AlertManeuverRequest() {
 }
 
 void AlertManeuverRequest::Run() {
-  LOG4CXX_INFO(logger_, "AlertManeuverRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if ((!(*message_)[strings::msg_params].keyExists(strings::soft_buttons)) &&
       (!(*message_)[strings::msg_params].keyExists(strings::tts_chunks))) {
@@ -127,7 +127,7 @@ void AlertManeuverRequest::Run() {
 }
 
 void AlertManeuverRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "AlertManeuverRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   mobile_apis::Result::eType result_code = mobile_apis::Result::INVALID_ENUM;
@@ -206,7 +206,7 @@ void AlertManeuverRequest::on_event(const event_engine::Event& event) {
 }
 
 bool AlertManeuverRequest::IsWhiteSpaceExist() {
-  LOG4CXX_INFO(logger_, "AlertManeuverRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   if ((*message_)[strings::msg_params].keyExists(strings::tts_chunks)) {
diff --git a/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc b/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc
index 99fcde69a8..8f9c73267f 100644
--- a/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc
+++ b/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc
@@ -47,7 +47,7 @@ AlertManeuverResponse::~AlertManeuverResponse() {
 }
 
 void AlertManeuverResponse::Run() {
-  LOG4CXX_INFO(logger_, "AlertManeuverResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/alert_request.cc b/src/components/application_manager/src/commands/mobile/alert_request.cc
index c08b7c32d7..aef393da41 100644
--- a/src/components/application_manager/src/commands/mobile/alert_request.cc
+++ b/src/components/application_manager/src/commands/mobile/alert_request.cc
@@ -84,7 +84,7 @@ bool AlertRequest::Init() {
 }
 
 void AlertRequest::Run() {
-  LOG4CXX_INFO(logger_, "AlertRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   uint32_t app_id = (*message_)[strings::params][strings::connection_key]
       .asInt();
@@ -116,7 +116,7 @@ void AlertRequest::onTimeOut() {
 }
 
 void AlertRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "AlertRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
@@ -206,7 +206,9 @@ void AlertRequest::on_event(const event_engine::Event& event) {
       response_success_ = true;
     }
 
-    if (mobile_apis::Result::ABORTED == tts_speak_response_ &&
+    if (
+        ((mobile_apis::Result::ABORTED == tts_speak_response_ )||
+        (mobile_apis::Result::REJECTED == tts_speak_response_)) &&
         (!flag_other_component_sent_)) {
       response_success_ = false;
       response_result_ = tts_speak_response_;
@@ -348,7 +350,7 @@ void AlertRequest::SendSpeakRequest(int32_t app_id) {
 }
 
 void AlertRequest::SendPlayToneNotification(int32_t app_id) {
-  LOG4CXX_INFO(logger_, "AlertRequest::SendPlayToneNotification");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // check playtone parameter
   if ((*message_)[strings::msg_params].keyExists(strings::play_tone)) {
@@ -356,7 +358,7 @@ void AlertRequest::SendPlayToneNotification(int32_t app_id) {
       // crate HMI basic communication playtone request
       smart_objects::SmartObject msg_params = smart_objects::SmartObject(
           smart_objects::SmartType_Map);
-
+      msg_params[strings::app_id] = app_id;
       CreateHMINotification(hmi_apis::FunctionID::BasicCommunication_PlayTone,
                             msg_params);
     }
@@ -364,7 +366,7 @@ void AlertRequest::SendPlayToneNotification(int32_t app_id) {
 }
 
 bool AlertRequest::CheckStringsOfAlertRequest() {
-  LOG4CXX_INFO(logger_, "AlertRequest::CheckStringsOfAlertRequest");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   if ((*message_)[strings::msg_params].keyExists(strings::alert_text1)) {
diff --git a/src/components/application_manager/src/commands/mobile/alert_response.cc b/src/components/application_manager/src/commands/mobile/alert_response.cc
index 5b8cd6557b..dac086a8b1 100644
--- a/src/components/application_manager/src/commands/mobile/alert_response.cc
+++ b/src/components/application_manager/src/commands/mobile/alert_response.cc
@@ -49,7 +49,7 @@ AlertResponse::~AlertResponse() {
 }
 
 void AlertResponse::Run() {
-  LOG4CXX_INFO(logger_, "AlertResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/change_registration_request.cc b/src/components/application_manager/src/commands/mobile/change_registration_request.cc
index 9780aad7bb..bf82f6c1b3 100644
--- a/src/components/application_manager/src/commands/mobile/change_registration_request.cc
+++ b/src/components/application_manager/src/commands/mobile/change_registration_request.cc
@@ -55,7 +55,7 @@ ChangeRegistrationRequest::~ChangeRegistrationRequest() {
 }
 
 void ChangeRegistrationRequest::Run() {
-  LOG4CXX_INFO(logger_, "ChangeRegistrationRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl* instance = ApplicationManagerImpl::instance();
   const HMICapabilities& hmi_capabilities = instance->hmi_capabilities();
@@ -166,19 +166,19 @@ void ChangeRegistrationRequest::Run() {
                  &tts_params, true);
 }
 
-bool ChangeRegistrationRequest::WasAnySuccess(
+bool ChangeRegistrationRequest::AllHmiResponsesSuccess(
       const hmi_apis::Common_Result::eType ui,
       const hmi_apis::Common_Result::eType vr,
       const hmi_apis::Common_Result::eType tts) {
 
   return
-      hmi_apis::Common_Result::SUCCESS == ui ||
-      hmi_apis::Common_Result::SUCCESS == vr ||
+      hmi_apis::Common_Result::SUCCESS == ui &&
+      hmi_apis::Common_Result::SUCCESS == vr &&
       hmi_apis::Common_Result::SUCCESS == tts;
 }
 
 void ChangeRegistrationRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "ChangeRegistrationRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   hmi_apis::FunctionID::eType event_id = event.id();
@@ -237,7 +237,7 @@ void ChangeRegistrationRequest::on_event(const event_engine::Event& event) {
     (*message_)[strings::params][strings::function_id] =
           mobile_apis::FunctionID::eType::ChangeRegistrationID;
 
-    SendResponse(WasAnySuccess(ui_result_, vr_result_, tts_result_),
+    SendResponse(AllHmiResponsesSuccess(ui_result_, vr_result_, tts_result_),
                  static_cast<mobile_apis::Result::eType>(greates_result_code),
                  NULL, &(message[strings::msg_params]));
   } else {
@@ -374,7 +374,7 @@ bool ChangeRegistrationRequest::IsWhiteSpaceExist() {
 }
 
 mobile_apis::Result::eType ChangeRegistrationRequest::CheckCoincidence() {
-  LOG4CXX_INFO(logger_, "ChangeRegistrationRequest::CheckCoincidence");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const smart_objects::SmartObject& msg_params =
       (*message_)[strings::msg_params];
diff --git a/src/components/application_manager/src/commands/mobile/change_registration_response.cc b/src/components/application_manager/src/commands/mobile/change_registration_response.cc
index 13c926ec82..557614f173 100644
--- a/src/components/application_manager/src/commands/mobile/change_registration_response.cc
+++ b/src/components/application_manager/src/commands/mobile/change_registration_response.cc
@@ -47,7 +47,7 @@ ChangeRegistrationResponse::~ChangeRegistrationResponse() {
 }
 
 void ChangeRegistrationResponse::Run() {
-  LOG4CXX_INFO(logger_, "ChangeRegistrationResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc
index 583f0a0460..ceef586e33 100644
--- a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc
+++ b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc
@@ -53,7 +53,7 @@ CreateInteractionChoiceSetRequest::~CreateInteractionChoiceSetRequest() {
 }
 
 void CreateInteractionChoiceSetRequest::Run() {
-  LOG4CXX_INFO(logger_, "CreateInteractionChoiceSetRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::params][strings::connection_key].asUInt());
@@ -114,7 +114,7 @@ void CreateInteractionChoiceSetRequest::Run() {
 
 mobile_apis::Result::eType CreateInteractionChoiceSetRequest::CheckChoiceSet(
     ApplicationConstSharedPtr app) {
-  LOG4CXX_INFO(logger_, "CreateInteractionChoiceSetRequest::CheckChoiceSet");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const smart_objects::SmartArray* new_choice_set_array =
     (*message_)[strings::msg_params][strings::choice_set].asArray();
@@ -141,7 +141,8 @@ mobile_apis::Result::eType CreateInteractionChoiceSetRequest::CheckChoiceSet(
     }
 
     // Check new choice set params along with already registered choice sets
-    const ChoiceSetMap& app_choice_set_map = app->choice_set_map();
+    const DataAccessor<ChoiceSetMap> accessor = app->choice_set_map();
+    const ChoiceSetMap& app_choice_set_map = accessor.GetData();
     ChoiceSetMap::const_iterator it = app_choice_set_map.begin();
     ChoiceSetMap::const_iterator itEnd = app_choice_set_map.end();
     for (; it != itEnd; ++it) {
@@ -257,7 +258,7 @@ bool CreateInteractionChoiceSetRequest::compareStr(
 
 bool CreateInteractionChoiceSetRequest::IsWhiteSpaceExist(
     const smart_objects::SmartObject& choice_set) {
-  LOG4CXX_INFO(logger_, "CreateInteractionChoiceSetRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   str = choice_set[strings::menu_name].asCharArray();
diff --git a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_response.cc b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_response.cc
index 8d6ea1b348..bc81206088 100644
--- a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_response.cc
+++ b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_response.cc
@@ -49,7 +49,7 @@ CreateInteractionChoiceSetResponse::~CreateInteractionChoiceSetResponse() {
 }
 
 void CreateInteractionChoiceSetResponse::Run() {
-  LOG4CXX_INFO(logger_, "CreateInteractionChoiceSetResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // check if response false
   if (true == (*message_)[strings::msg_params].keyExists(strings::success)) {
diff --git a/src/components/application_manager/src/commands/mobile/delete_command_request.cc b/src/components/application_manager/src/commands/mobile/delete_command_request.cc
index 3c3ee88203..e76422d50e 100644
--- a/src/components/application_manager/src/commands/mobile/delete_command_request.cc
+++ b/src/components/application_manager/src/commands/mobile/delete_command_request.cc
@@ -55,7 +55,7 @@ DeleteCommandRequest::~DeleteCommandRequest() {
 }
 
 void DeleteCommandRequest::Run() {
-  LOG4CXX_INFO(logger_, "DeleteCommandRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::params][strings::connection_key].asUInt());
@@ -109,7 +109,7 @@ void DeleteCommandRequest::Run() {
 }
 
 void DeleteCommandRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "DeleteCommandRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/delete_command_response.cc b/src/components/application_manager/src/commands/mobile/delete_command_response.cc
index 812e587430..75178bcb4d 100644
--- a/src/components/application_manager/src/commands/mobile/delete_command_response.cc
+++ b/src/components/application_manager/src/commands/mobile/delete_command_response.cc
@@ -46,7 +46,7 @@ DeleteCommandResponse::~DeleteCommandResponse() {
 }
 
 void DeleteCommandResponse::Run() {
-  LOG4CXX_INFO(logger_, "DeleteCommandResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/delete_file_request.cc b/src/components/application_manager/src/commands/mobile/delete_file_request.cc
index ca5a4395fc..4c753871ce 100644
--- a/src/components/application_manager/src/commands/mobile/delete_file_request.cc
+++ b/src/components/application_manager/src/commands/mobile/delete_file_request.cc
@@ -49,7 +49,7 @@ DeleteFileRequest::~DeleteFileRequest() {
 }
 
 void DeleteFileRequest::Run() {
-  LOG4CXX_INFO(logger_, "DeleteFileRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr application =
       ApplicationManagerImpl::instance()->application(connection_key());
diff --git a/src/components/application_manager/src/commands/mobile/delete_file_response.cc b/src/components/application_manager/src/commands/mobile/delete_file_response.cc
index 81470ccf6b..1bbb18313f 100644
--- a/src/components/application_manager/src/commands/mobile/delete_file_response.cc
+++ b/src/components/application_manager/src/commands/mobile/delete_file_response.cc
@@ -47,7 +47,7 @@ DeleteFileResponse::~DeleteFileResponse() {
 }
 
 void DeleteFileResponse::Run() {
-  LOG4CXX_INFO(logger_, "DeleteFileResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t app_id = (*message_)[strings::params][strings::connection_key]
       .asUInt();
   ApplicationSharedPtr app =
diff --git a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc
index 1fcd4b33d8..6c61bfd2a2 100644
--- a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc
+++ b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc
@@ -50,7 +50,7 @@ DeleteInteractionChoiceSetRequest::~DeleteInteractionChoiceSetRequest() {
 }
 
 void DeleteInteractionChoiceSetRequest::Run() {
-  LOG4CXX_INFO(logger_, "DeleteInteractionChoiceSetRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::params][strings::connection_key].asUInt());
@@ -94,8 +94,9 @@ void DeleteInteractionChoiceSetRequest::Run() {
 bool DeleteInteractionChoiceSetRequest::ChoiceSetInUse(ApplicationConstSharedPtr app) {
   if (app->is_perform_interaction_active()) {
     // retrieve stored choice sets for perform interaction
-    const PerformChoiceSetMap& choice_set_map = app
-        ->performinteraction_choice_set_map();
+  const DataAccessor<PerformChoiceSetMap> accessor =
+      app->performinteraction_choice_set_map();
+  const PerformChoiceSetMap& choice_set_map = accessor.GetData();
 
     PerformChoiceSetMap::const_iterator it = choice_set_map.begin();
     for (; choice_set_map.end() != it; ++it) {
diff --git a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_response.cc b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_response.cc
index d260add7cc..f9ee513b94 100644
--- a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_response.cc
+++ b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_response.cc
@@ -50,7 +50,7 @@ DeleteInteractionChoiceSetResponse::~DeleteInteractionChoiceSetResponse() {
 }
 
 void DeleteInteractionChoiceSetResponse::Run() {
-  LOG4CXX_INFO(logger_, "DeleteInteractionChoiceSetResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // check if response false
   if (true == (*message_)[strings::msg_params].keyExists(strings::success)) {
diff --git a/src/components/application_manager/src/commands/mobile/delete_sub_menu_request.cc b/src/components/application_manager/src/commands/mobile/delete_sub_menu_request.cc
index d91e742687..48d98114cb 100644
--- a/src/components/application_manager/src/commands/mobile/delete_sub_menu_request.cc
+++ b/src/components/application_manager/src/commands/mobile/delete_sub_menu_request.cc
@@ -48,7 +48,7 @@ DeleteSubMenuRequest::~DeleteSubMenuRequest() {
 }
 
 void DeleteSubMenuRequest::Run() {
-  LOG4CXX_INFO(logger_, "DeleteSubMenuRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::params][strings::connection_key].asUInt());
@@ -77,9 +77,10 @@ void DeleteSubMenuRequest::Run() {
 }
 
 void DeleteSubMenuRequest::DeleteSubMenuVRCommands(ApplicationConstSharedPtr app) {
-  LOG4CXX_INFO(logger_, "DeleteSubMenuRequest::DeleteSubMenuVRCommands");
+  LOG4CXX_AUTO_TRACE(logger_);
 
-  const CommandsMap& commands = app->commands_map();
+  const DataAccessor<CommandsMap> accessor = app->commands_map();
+  const CommandsMap& commands = accessor.GetData();
   CommandsMap::const_iterator it = commands.begin();
 
   for (; commands.end() != it; ++it) {
@@ -104,9 +105,10 @@ void DeleteSubMenuRequest::DeleteSubMenuVRCommands(ApplicationConstSharedPtr app
 }
 
 void DeleteSubMenuRequest::DeleteSubMenuUICommands(ApplicationSharedPtr const app) {
-  LOG4CXX_INFO(logger_, "DeleteSubMenuRequest::DeleteSubMenuUICommands");
+  LOG4CXX_AUTO_TRACE(logger_);
 
-  const CommandsMap& commands = app->commands_map();
+  const DataAccessor<CommandsMap> accessor = app->commands_map();
+  const CommandsMap& commands = accessor.GetData();
   CommandsMap::const_iterator it = commands.begin();
 
   while (commands.end() != it) {
@@ -136,7 +138,7 @@ void DeleteSubMenuRequest::DeleteSubMenuUICommands(ApplicationSharedPtr const ap
 }
 
 void DeleteSubMenuRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "DeleteSubMenuRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc b/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc
index 0a25a11610..05795e5908 100644
--- a/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc
+++ b/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc
@@ -46,7 +46,7 @@ DeleteSubMenuResponse::~DeleteSubMenuResponse() {
 }
 
 void DeleteSubMenuResponse::Run() {
-  LOG4CXX_INFO(logger_, "DeleteSubMenuResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
diff --git a/src/components/application_manager/src/commands/mobile/diagnostic_message_request.cc b/src/components/application_manager/src/commands/mobile/diagnostic_message_request.cc
index 75016c05fb..7b5cf5fd9a 100644
--- a/src/components/application_manager/src/commands/mobile/diagnostic_message_request.cc
+++ b/src/components/application_manager/src/commands/mobile/diagnostic_message_request.cc
@@ -48,7 +48,7 @@ DiagnosticMessageRequest::~DiagnosticMessageRequest() {
 }
 
 void DiagnosticMessageRequest::Run() {
-  LOG4CXX_INFO(logger_, "DiagnosticMessageRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
                                connection_key());
@@ -68,7 +68,7 @@ void DiagnosticMessageRequest::Run() {
 }
 
 void DiagnosticMessageRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "DiagnosticMessageRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc b/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc
index 2a8b234fff..9c399a00c8 100644
--- a/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc
+++ b/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc
@@ -46,7 +46,7 @@ DiagnosticMessageResponse::~DiagnosticMessageResponse() {
 }
 
 void DiagnosticMessageResponse::Run() {
-  LOG4CXX_INFO(logger_, "DiagnosticMessageResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/dial_number_request.cc b/src/components/application_manager/src/commands/mobile/dial_number_request.cc
index 140f43128d..749b19a520 100644
--- a/src/components/application_manager/src/commands/mobile/dial_number_request.cc
+++ b/src/components/application_manager/src/commands/mobile/dial_number_request.cc
@@ -47,7 +47,7 @@ DialNumberRequest::~DialNumberRequest() {
 }
 
 void DialNumberRequest::Run() {
-  LOG4CXX_INFO(logger_, "DialNumberRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendResponse(false, mobile_apis::Result::UNSUPPORTED_REQUEST);
 }
diff --git a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_request.cc
index eedc9f813e..78a867a6d8 100644
--- a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_request.cc
+++ b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_request.cc
@@ -47,13 +47,13 @@ EndAudioPassThruRequest::~EndAudioPassThruRequest() {
 }
 
 void EndAudioPassThruRequest::Run() {
-  LOG4CXX_INFO(logger_, "EndAudioPassThruRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendHMIRequest(hmi_apis::FunctionID::UI_EndAudioPassThru, NULL, true);
 }
 
 void EndAudioPassThruRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "EndAudioPassThruRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc
index 128d921f9f..0ac1a00bd4 100644
--- a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc
+++ b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc
@@ -47,7 +47,7 @@ EndAudioPassThruResponse::~EndAudioPassThruResponse() {
 }
 
 void EndAudioPassThruResponse::Run() {
-  LOG4CXX_INFO(logger_, "EndAudioPassThruResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/get_dtcs_request.cc b/src/components/application_manager/src/commands/mobile/get_dtcs_request.cc
index 9a81f94db1..8e2a0222f7 100644
--- a/src/components/application_manager/src/commands/mobile/get_dtcs_request.cc
+++ b/src/components/application_manager/src/commands/mobile/get_dtcs_request.cc
@@ -48,7 +48,7 @@ GetDTCsRequest::~GetDTCsRequest() {
 }
 
 void GetDTCsRequest::Run() {
-  LOG4CXX_INFO(logger_, "GetDTCsRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::params][strings::connection_key].asUInt());
@@ -82,7 +82,7 @@ void GetDTCsRequest::Run() {
 }
 
 void GetDTCsRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "GetDTCsRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc b/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc
index 2ed7a92952..523711c975 100644
--- a/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc
+++ b/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc
@@ -46,7 +46,7 @@ GetDTCsResponse::~GetDTCsResponse() {
 }
 
 void GetDTCsResponse::Run() {
-  LOG4CXX_INFO(logger_, "GetDTCsResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc b/src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc
index a3d08a15ff..546b14853c 100644
--- a/src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc
+++ b/src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc
@@ -54,7 +54,7 @@ GetVehicleDataRequest::~GetVehicleDataRequest() {
 }
 
 void GetVehicleDataRequest::Run() {
-  LOG4CXX_INFO(logger_, "GetVehicleDataRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   int32_t app_id = (*message_)[strings::params][strings::connection_key].asUInt();
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id);
@@ -213,7 +213,7 @@ GetVehicleDataRequest::~GetVehicleDataRequest() {
 }
 
 void GetVehicleDataRequest::Run() {
-  LOG4CXX_INFO(logger_, "GetVehicleDataRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   int32_t app_id = (*message_)[strings::params][strings::connection_key].asUInt();
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id);
@@ -260,7 +260,7 @@ void GetVehicleDataRequest::Run() {
 }
 
 void GetVehicleDataRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "GetVehicleDataRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc b/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc
index d9087fdc61..5491e9b1aa 100644
--- a/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc
+++ b/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc
@@ -47,7 +47,7 @@ GetVehicleDataResponse::~GetVehicleDataResponse() {
 }
 
 void GetVehicleDataResponse::Run() {
-  LOG4CXX_INFO(logger_, "GetVehicleDataResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/list_files_request.cc b/src/components/application_manager/src/commands/mobile/list_files_request.cc
index d0fa71d466..427443e3e9 100644
--- a/src/components/application_manager/src/commands/mobile/list_files_request.cc
+++ b/src/components/application_manager/src/commands/mobile/list_files_request.cc
@@ -50,7 +50,7 @@ ListFilesRequest::~ListFilesRequest() {
 }
 
 void ListFilesRequest::Run() {
-  LOG4CXX_INFO(logger_, "ListFilesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr application =
       ApplicationManagerImpl::instance()->application(connection_key());
diff --git a/src/components/application_manager/src/commands/mobile/list_files_response.cc b/src/components/application_manager/src/commands/mobile/list_files_response.cc
index 6ffbec1ac4..42bd1e6f07 100644
--- a/src/components/application_manager/src/commands/mobile/list_files_response.cc
+++ b/src/components/application_manager/src/commands/mobile/list_files_response.cc
@@ -47,7 +47,7 @@ ListFilesResponse::~ListFilesResponse() {
 }
 
 void ListFilesResponse::Run() {
-  LOG4CXX_INFO(logger_, "ListFilesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/on_app_interface_unregistered_notification.cc b/src/components/application_manager/src/commands/mobile/on_app_interface_unregistered_notification.cc
index ebd0d6aac1..e3e51faa6e 100644
--- a/src/components/application_manager/src/commands/mobile/on_app_interface_unregistered_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_app_interface_unregistered_notification.cc
@@ -47,7 +47,7 @@ OnAppInterfaceUnregisteredNotification::~OnAppInterfaceUnregisteredNotification(
 }
 
 void OnAppInterfaceUnregisteredNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnAppInterfaceUnregisteredNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendNotification();
 }
diff --git a/src/components/application_manager/src/commands/mobile/on_audio_pass_thru_notification.cc b/src/components/application_manager/src/commands/mobile/on_audio_pass_thru_notification.cc
index 2515f591b1..d1329bf8ea 100644
--- a/src/components/application_manager/src/commands/mobile/on_audio_pass_thru_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_audio_pass_thru_notification.cc
@@ -45,7 +45,7 @@ OnAudioPassThruNotification::~OnAudioPassThruNotification() {
 }
 
 void OnAudioPassThruNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnAudioPassThruNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendNotification();
 }
diff --git a/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc b/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc
index 55b9b8818d..fbc3bcf29e 100644
--- a/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_button_event_notification.cc
@@ -51,7 +51,7 @@ OnButtonEventNotification::~OnButtonEventNotification() {
 }
 
 void OnButtonEventNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnButtonEventNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const uint32_t btn_id =
       static_cast<uint32_t>(
diff --git a/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc b/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc
index cfafc7af1c..d7139c1b90 100644
--- a/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_button_press_notification.cc
@@ -51,7 +51,7 @@ OnButtonPressNotification::~OnButtonPressNotification() {
 }
 
 void OnButtonPressNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnButtonPressNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const uint32_t btn_id =
       static_cast<uint32_t>(
diff --git a/src/components/application_manager/src/commands/mobile/on_command_notification.cc b/src/components/application_manager/src/commands/mobile/on_command_notification.cc
index 8342d05a45..9bba1851f6 100644
--- a/src/components/application_manager/src/commands/mobile/on_command_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_command_notification.cc
@@ -47,7 +47,7 @@ OnCommandNotification::~OnCommandNotification() {
 }
 
 void OnCommandNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnCommandNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::msg_params][strings::app_id].asInt());
diff --git a/src/components/application_manager/src/commands/mobile/on_driver_distraction_notification.cc b/src/components/application_manager/src/commands/mobile/on_driver_distraction_notification.cc
index fc92c17e94..e9145520f4 100644
--- a/src/components/application_manager/src/commands/mobile/on_driver_distraction_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_driver_distraction_notification.cc
@@ -51,7 +51,7 @@ OnDriverDistractionNotification::~OnDriverDistractionNotification() {
 }
 
 void OnDriverDistractionNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnDriverDistractionNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendNotification();
 }
diff --git a/src/components/application_manager/src/commands/mobile/on_hash_change_notification.cc b/src/components/application_manager/src/commands/mobile/on_hash_change_notification.cc
index b9ee1339bb..66d50f4871 100644
--- a/src/components/application_manager/src/commands/mobile/on_hash_change_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_hash_change_notification.cc
@@ -54,7 +54,7 @@ OnHashChangeNotification::~OnHashChangeNotification() {
 }
 
 void OnHashChangeNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnHashChangeNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   (*message_)[strings::params][strings::message_type] =
       static_cast<int32_t>(application_manager::MessageType::kNotification);
@@ -62,10 +62,15 @@ void OnHashChangeNotification::Run() {
   int32_t app_id;
   app_id = (*message_)[strings::params][strings::connection_key].asInt();
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id);
-  std::stringstream stream;
-  stream << app->curHash();
-  (*message_)[strings::msg_params][strings::hash_id] = stream.str();
-  SendNotification();
+  if (app) {
+    std::stringstream stream;
+    stream << app->curHash();
+    (*message_)[strings::msg_params][strings::hash_id] = stream.str();
+    SendNotification();
+  } else {
+    LOG4CXX_WARN(logger_, "Application with app_id " << app_id << " does not exist");
+  }
+
 }
 
 }  //namespace mobile
diff --git a/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc b/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc
index 9c03c0f623..9595310061 100644
--- a/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc
@@ -49,7 +49,7 @@ OnHMIStatusNotification::~OnHMIStatusNotification() {
 }
 
 void OnHMIStatusNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnHMIStatusNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   (*message_)[strings::params][strings::message_type] = static_cast<int32_t> (
       application_manager::MessageType::kNotification);
diff --git a/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc b/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc
index 969885ab16..b8c6d6f114 100644
--- a/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_keyboard_input_notification.cc
@@ -51,7 +51,7 @@ OnKeyBoardInputNotification::~OnKeyBoardInputNotification() {
 }
 
 void OnKeyBoardInputNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnKeyBoardInputNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const std::vector<ApplicationSharedPtr>& applications =
       ApplicationManagerImpl::instance()->applications_with_navi();
diff --git a/src/components/application_manager/src/commands/mobile/on_language_change_notification.cc b/src/components/application_manager/src/commands/mobile/on_language_change_notification.cc
index f550df8748..43b1b5b921 100644
--- a/src/components/application_manager/src/commands/mobile/on_language_change_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_language_change_notification.cc
@@ -46,7 +46,7 @@ OnLanguageChangeNotification::~OnLanguageChangeNotification() {
 }
 
 void OnLanguageChangeNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnLanguageChangeNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendNotification();
 }
diff --git a/src/components/application_manager/src/commands/mobile/on_permissions_change_notification.cc b/src/components/application_manager/src/commands/mobile/on_permissions_change_notification.cc
index 37c81085eb..62ea1af1fc 100644
--- a/src/components/application_manager/src/commands/mobile/on_permissions_change_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_permissions_change_notification.cc
@@ -48,7 +48,7 @@ OnPermissionsChangeNotification::~OnPermissionsChangeNotification() {
 }
 
 void OnPermissionsChangeNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnPermissionsChangeNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   (*message_)[strings::params][strings::message_type] =
       static_cast<int32_t>(application_manager::MessageType::kNotification);
diff --git a/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc b/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc
index ebf98cd7e8..7e5c381bef 100644
--- a/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc
@@ -50,7 +50,7 @@ OnSystemRequestNotification::~OnSystemRequestNotification() {
 }
 
 void OnSystemRequestNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnSystemRequestNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   mobile_apis::RequestType::eType request_type = static_cast<mobile_apis::RequestType::eType>
       ((*message_)[strings::msg_params][strings::request_type].asInt());
diff --git a/src/components/application_manager/src/commands/mobile/on_tbt_client_state_notification.cc b/src/components/application_manager/src/commands/mobile/on_tbt_client_state_notification.cc
index 05494c6144..99a5d665db 100644
--- a/src/components/application_manager/src/commands/mobile/on_tbt_client_state_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_tbt_client_state_notification.cc
@@ -49,7 +49,7 @@ OnTBTClientStateNotification::~OnTBTClientStateNotification() {
 }
 
 void OnTBTClientStateNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnTBTClientStateNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   (*message_)[strings::params][strings::message_type] =
       static_cast<int32_t>(application_manager::MessageType::kNotification);
diff --git a/src/components/application_manager/src/commands/mobile/on_touch_event_notification.cc b/src/components/application_manager/src/commands/mobile/on_touch_event_notification.cc
index 250faa8f38..6db54289eb 100644
--- a/src/components/application_manager/src/commands/mobile/on_touch_event_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_touch_event_notification.cc
@@ -50,7 +50,7 @@ OnTouchEventNotification::~OnTouchEventNotification() {
 }
 
 void OnTouchEventNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnTouchEventNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const std::vector<ApplicationSharedPtr>& applications =
       ApplicationManagerImpl::instance()->applications_with_navi();
diff --git a/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc
index 420c42f30c..044bb16b40 100644
--- a/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc
@@ -50,7 +50,7 @@ OnVehicleDataNotification::~OnVehicleDataNotification() {
 }
 
 void OnVehicleDataNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVehicleDataNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const VehicleData& vehicle_data = MessageHelper::vehicle_data();
   VehicleData::const_iterator it = vehicle_data.begin();
diff --git a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc
index a730995f5d..8ef6cfd6ee 100644
--- a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc
+++ b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc
@@ -55,7 +55,7 @@ PerformAudioPassThruRequest::~PerformAudioPassThruRequest() {
 }
 
 void PerformAudioPassThruRequest::onTimeOut() {
-  LOG4CXX_INFO(logger_, "PerformAudioPassThruRequest::onTimeOut");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if (ApplicationManagerImpl::instance()->end_audio_pass_thru()) {
     ApplicationManagerImpl::instance()->StopAudioPassThru(connection_key());
@@ -73,7 +73,7 @@ bool PerformAudioPassThruRequest::Init() {
 }
 
 void PerformAudioPassThruRequest::Run() {
-  LOG4CXX_INFO(logger_, "PerformAudioPassThruRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app =
       ApplicationManagerImpl::instance()->application(connection_key());
@@ -111,7 +111,7 @@ void PerformAudioPassThruRequest::Run() {
 }
 
 void PerformAudioPassThruRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "PerformAudioPassThruRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
@@ -260,7 +260,7 @@ void PerformAudioPassThruRequest::StartMicrophoneRecording() {
 }
 
 bool PerformAudioPassThruRequest::IsWhiteSpaceExist() {
-  LOG4CXX_INFO(logger_, "PerformAudioPassThruRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   if ((*message_)[strings::msg_params].keyExists(strings::initial_prompt)) {
diff --git a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc
index a10eaac9f3..585383889d 100644
--- a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc
+++ b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc
@@ -48,7 +48,7 @@ PerformAudioPassThruResponse::~PerformAudioPassThruResponse() {
 }
 
 void PerformAudioPassThruResponse::Run() {
-  LOG4CXX_INFO(logger_, "PerformAudioPassThruResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc
index 12514626a6..c7e9886ce5 100644
--- a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc
+++ b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc
@@ -64,7 +64,7 @@ PerformInteractionRequest::~PerformInteractionRequest() {
 }
 
 void PerformInteractionRequest::onTimer() {
-  LOG4CXX_INFO(logger_, "PerformInteractionRequest::onTimer");
+  LOG4CXX_AUTO_TRACE(logger_);
 }
 
 bool PerformInteractionRequest::Init() {
@@ -87,7 +87,7 @@ bool PerformInteractionRequest::Init() {
 }
 
 void PerformInteractionRequest::Run() {
-  LOG4CXX_INFO(logger_, "PerformInteractionRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app =
       ApplicationManagerImpl::instance()->application(connection_key());
@@ -243,7 +243,7 @@ void PerformInteractionRequest::Run() {
 }
 
 void PerformInteractionRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "PerformInteractionRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   switch (event.id()) {
     case hmi_apis::FunctionID::UI_OnResetTimeout: {
@@ -271,7 +271,7 @@ void PerformInteractionRequest::on_event(const event_engine::Event& event) {
 }
 
 void PerformInteractionRequest::onTimeOut() {
-  LOG4CXX_INFO(logger_, "PerformInteractionRequest::onTimeOut");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   switch (interaction_mode_) {
     case mobile_apis::InteractionMode::BOTH: {
@@ -308,7 +308,7 @@ void PerformInteractionRequest::onTimeOut() {
 
 void PerformInteractionRequest::ProcessVRResponse(
     const smart_objects::SmartObject& message) {
-  LOG4CXX_INFO(logger_, "PerformInteractionRequest::ProcessVRResponse");
+  LOG4CXX_AUTO_TRACE(logger_);
   const uint32_t app_id = connection_key();
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id);
   if (!app.get()) {
@@ -336,6 +336,14 @@ void PerformInteractionRequest::ProcessVRResponse(
     }
   }
 
+  if (mobile_apis::Result::SUCCESS == vr_perform_interaction_code_ &&
+      mobile_apis::InteractionMode::MANUAL_ONLY == interaction_mode_) {
+    LOG4CXX_INFO(logger_, "VR response SUCCESS in MANUAL_ONLY mode " <<
+                          "Wait for UI response");
+    // in case MANUAL_ONLY mode VR.PI SUCCESS just return
+    return;
+  }
+
   smart_objects::SmartObject msg_params =
         smart_objects::SmartObject(smart_objects::SmartType_Map);
   smart_objects::SmartObject* ptr_msg_params = NULL;
@@ -372,8 +380,7 @@ void PerformInteractionRequest::ProcessVRResponse(
 
 void PerformInteractionRequest::ProcessPerformInteractionResponse(
     const smart_objects::SmartObject& message) {
-  LOG4CXX_INFO(logger_,
-               "PerformInteractionRequest::ProcessPerformInteractionResponse");
+  LOG4CXX_AUTO_TRACE(logger_);
   const uint32_t app_id = connection_key();
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id);
   if (!app.get()) {
@@ -565,6 +572,7 @@ void PerformInteractionRequest::SendVRPerformInteractionRequest(
             smart_objects::SmartObject item(smart_objects::SmartType_Map);
             // Since there is no custom data from application side, SDL should
             // construct prompt and append delimiter to each item
+            item[strings::type] = hmi_apis::Common_SpeechCapabilities::SC_TEXT;
             item[strings::text] = vr_commands[0].asString() +
                                   profile::Profile::instance()->tts_delimiter();
             msg_params[strings::help_prompt][index++] = item;
@@ -752,7 +760,7 @@ void PerformInteractionRequest::DisablePerformInteraction() {
 }
 
 bool PerformInteractionRequest::IsWhiteSpaceExist() {
-  LOG4CXX_INFO(logger_, "PerformInteractionRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   str = (*message_)[strings::msg_params][strings::initial_text].asCharArray();
@@ -847,9 +855,10 @@ void PerformInteractionRequest::TerminatePerformInteraction() {
 
 bool PerformInteractionRequest::CheckChoiceIDFromResponse(
     ApplicationSharedPtr app, int32_t choice_id) {
-  LOG4CXX_INFO(logger_, "PerformInteractionRequest::CheckChoiceIDFromResponse");
-  const PerformChoiceSetMap& choice_set_map = app
-        ->performinteraction_choice_set_map();
+  LOG4CXX_AUTO_TRACE(logger_);
+  const DataAccessor<PerformChoiceSetMap> accessor =
+      app->performinteraction_choice_set_map();
+  const PerformChoiceSetMap& choice_set_map = accessor.GetData();
 
   for (PerformChoiceSetMap::const_iterator it = choice_set_map.begin();
       choice_set_map.end() != it; ++it) {
diff --git a/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc b/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc
index 4ceb4ce3b3..59d706926d 100644
--- a/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc
+++ b/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc
@@ -47,7 +47,7 @@ PerformInteractionResponse::~PerformInteractionResponse() {
 }
 
 void PerformInteractionResponse::Run() {
-  LOG4CXX_INFO(logger_, "PerformInteractionResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/put_file_request.cc b/src/components/application_manager/src/commands/mobile/put_file_request.cc
index 1da7e08e47..89dd8d456d 100644
--- a/src/components/application_manager/src/commands/mobile/put_file_request.cc
+++ b/src/components/application_manager/src/commands/mobile/put_file_request.cc
@@ -55,7 +55,7 @@ PutFileRequest::~PutFileRequest() {
 }
 
 void PutFileRequest::Run() {
-  LOG4CXX_INFO(logger_, "PutFileRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr application =
       ApplicationManagerImpl::instance()->application(connection_key());
@@ -224,7 +224,7 @@ void PutFileRequest::Run() {
       break;
     }
     default:
-      LOG4CXX_INFO(logger_, "Save in unsuccessful. Result = " << save_result);
+      LOG4CXX_WARN(logger_, "Save in unsuccessful. Result = " << save_result);
       SendResponse(false, save_result, "Can't save file", &response_params);
       break;
   }
diff --git a/src/components/application_manager/src/commands/mobile/put_file_response.cc b/src/components/application_manager/src/commands/mobile/put_file_response.cc
index 4ab950d7a8..52598fda16 100644
--- a/src/components/application_manager/src/commands/mobile/put_file_response.cc
+++ b/src/components/application_manager/src/commands/mobile/put_file_response.cc
@@ -48,7 +48,7 @@ PutFileResponse::~PutFileResponse() {
 }
 
 void PutFileResponse::Run() {
-  LOG4CXX_INFO(logger_, "PutFileResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t app_id = (*message_)[strings::params][strings::connection_key]
       .asUInt();
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id);
diff --git a/src/components/application_manager/src/commands/mobile/read_did_request.cc b/src/components/application_manager/src/commands/mobile/read_did_request.cc
index 1de080df4c..5a066aab4d 100644
--- a/src/components/application_manager/src/commands/mobile/read_did_request.cc
+++ b/src/components/application_manager/src/commands/mobile/read_did_request.cc
@@ -49,7 +49,7 @@ ReadDIDRequest::~ReadDIDRequest() {
 }
 
 void ReadDIDRequest::Run() {
-  LOG4CXX_INFO(logger_, "ReadDIDRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   uint32_t app_id = (*message_)[strings::params][strings::connection_key]
       .asUInt();
@@ -96,7 +96,7 @@ void ReadDIDRequest::Run() {
 }
 
 void ReadDIDRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "ReadDIDRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/read_did_response.cc b/src/components/application_manager/src/commands/mobile/read_did_response.cc
index 888b590758..1133fe89ed 100644
--- a/src/components/application_manager/src/commands/mobile/read_did_response.cc
+++ b/src/components/application_manager/src/commands/mobile/read_did_response.cc
@@ -46,7 +46,7 @@ ReadDIDResponse::~ReadDIDResponse() {
 }
 
 void ReadDIDResponse::Run() {
-  LOG4CXX_INFO(logger_, "ReadDIDResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
index a035e86f2d..1d81ab6b20 100644
--- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
@@ -124,14 +124,15 @@ namespace commands {
 
 RegisterAppInterfaceRequest::RegisterAppInterfaceRequest(
   const MessageSharedPtr& message)
-  : CommandRequestImpl(message) {
+  : CommandRequestImpl(message),
+    result_checking_app_hmi_type_(mobile_apis::Result::INVALID_ENUM) {
 }
 
 RegisterAppInterfaceRequest::~RegisterAppInterfaceRequest() {
 }
 
 bool RegisterAppInterfaceRequest::Init() {
-  LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::Init");
+  LOG4CXX_AUTO_TRACE(logger_);
   return true;
 }
 
@@ -139,8 +140,9 @@ void RegisterAppInterfaceRequest::Run() {
   LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::Run " << connection_key());
 
   // Fix problem with SDL and HMI HTML. This problem is not actual for HMI PASA.
-  // Flag conditional compilation "CUSTOMER_PASA" is used in order to exclude hit code
+  // Flag conditional compilation specific to customer is used in order to exclude hit code
   // to RTC
+  // FIXME(EZamakhov): on shutdown - get freez
   if (true == profile::Profile::instance()->launch_hmi()) {
     // wait till HMI started
     while (!ApplicationManagerImpl::instance()->IsHMICooperating()) {
@@ -189,13 +191,6 @@ void RegisterAppInterfaceRequest::Run() {
     return;
   }
 
-  mobile_apis::Result::eType restriction_result = CheckRestrictions();
-  if (mobile_apis::Result::SUCCESS != restriction_result) {
-    LOG4CXX_ERROR_EXT(logger_, "Param names restrictions check failed.");
-    SendResponse(false, restriction_result);
-    return;
-  }
-
   if (IsWhiteSpaceExist()) {
     LOG4CXX_INFO(logger_,
                   "Incoming register app interface has contains \t\n \\t \\n");
@@ -281,12 +276,11 @@ void RegisterAppInterfaceRequest::Run() {
         device_info);
 
     SendRegisterAppInterfaceResponseToMobile();
-    policy::PolicyHandler::instance()->PTExchangeAtRegistration(mobile_app_id);
   }
 }
 
 void RegisterAppInterfaceRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   switch (event.id()) {
     case hmi_apis::FunctionID::TTS_Speak: {
       const smart_objects::SmartObject& message = event.smart_object();
@@ -465,8 +459,8 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
   ResumeCtrl& resumer = ApplicationManagerImpl::instance()->resume_controller();
   uint32_t hash_id = 0;
 
-  const char* add_info = "";
-  const bool resumption = (*message_)[strings::msg_params].keyExists(strings::hash_id);
+  std::string add_info("");
+  bool resumption = (*message_)[strings::msg_params].keyExists(strings::hash_id);
   bool need_restore_vr = resumption;
   if (resumption) {
     hash_id = (*message_)[strings::msg_params][strings::hash_id].asUInt();
@@ -484,8 +478,17 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
       add_info = " Resume Succeed";
     }
   }
+  if ((mobile_apis::Result::SUCCESS == result) &&
+      (mobile_apis::Result::INVALID_ENUM != result_checking_app_hmi_type_)) {
+    add_info += response_info_;
+    result = result_checking_app_hmi_type_;
+  }
+  SendResponse(true, result, add_info.c_str(), params);
 
-  SendResponse(true, result, add_info, params);
+  // in case application exist in resumption we need to send resumeVrgrammars
+  if (false == resumption) {
+    resumption = resumer.IsApplicationSaved(application->mobile_app_id()->asString());
+  }
 
   MessageHelper::SendOnAppRegisteredNotificationToHMI(*(application.get()),
                                                       resumption,
@@ -502,7 +505,7 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
 
 mobile_apis::Result::eType
 RegisterAppInterfaceRequest::CheckCoincidence() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& msg_params =
     (*message_)[strings::msg_params];
 
@@ -604,7 +607,7 @@ mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckWithPolicyData() {
       if (!log.empty()) {
         response_info_ = "Following AppHMITypes are not present in policy "
                          "table:" + log;
-        result = mobile_apis::Result::WARNINGS;
+        result_checking_app_hmi_type_ = mobile_apis::Result::WARNINGS;
       }
     }
     // Replace AppHMITypes in request with values allowed by policy table
@@ -657,75 +660,6 @@ void RegisterAppInterfaceRequest::FillDeviceInfo(
   }
 }
 
-mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckRestrictions() const {
-
-  LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::CheckRestrictions");
-
-  const smart_objects::SmartObject& msg_params =
-    (*message_)[strings::msg_params];
-
-  const std::string& app_name = msg_params[strings::app_name].asString();
-
-  if (ClearParamName(app_name).empty()) {
-    printf("Application name is empty.\n");
-    return mobile_apis::Result::INVALID_DATA;
-  }
-
-  if ((app_name[0] == '\n') ||
-      ((app_name[0] == '\\') && (app_name[1] == 'n'))) {
-
-    printf("Application name has invalid characters.");
-    return mobile_apis::Result::INVALID_DATA;
-  }
-
-  if (msg_params.keyExists(strings::tts_name)) {
-
-    const smart_objects::SmartArray* tts =
-      msg_params[strings::tts_name].asArray();
-
-    smart_objects::SmartArray::const_iterator it = tts->begin();
-    smart_objects::SmartArray::const_iterator it_end = tts->end();
-
-    for (; it != it_end; ++it) {
-
-      const std::string& tts_name = (*it)[strings::text].asString();
-
-      if (ClearParamName(tts_name).empty()) {
-        printf("TTS value is empty.");
-        return mobile_apis::Result::INVALID_DATA;
-      }
-
-      if ((tts_name[0] == '\n') ||
-          ((tts_name[0] == '\\') && (tts_name[1] == 'n'))) {
-
-        printf("TTS value(s) has invalid characters.");
-        return mobile_apis::Result::INVALID_DATA;
-      }
-    }
-  }
-
-  return mobile_apis::Result::SUCCESS;
-}
-
-std::string
-RegisterAppInterfaceRequest::ClearParamName(std::string param_name) const {
-
-  // Expecting for chars different from newlines and spaces in the appName
-  //
-  // There is an agreement, that "\n" is not allowed symbols, so we have to
-  // check for this case also
-
-  std::string newline = "\\n";
-  while (std::string::npos != param_name.find(newline)) {
-    param_name.erase(param_name.find(newline), newline.length());
-  }
-
-  std::string::iterator param_name_new_end =
-    std::remove_if(param_name.begin(), param_name.end(), ::isspace);
-
-  return std::string(param_name.begin(), param_name_new_end);
-}
-
 bool RegisterAppInterfaceRequest::IsApplicationWithSameAppIdRegistered() {
 
   LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::"
@@ -750,7 +684,7 @@ bool RegisterAppInterfaceRequest::IsApplicationWithSameAppIdRegistered() {
 }
 
 bool RegisterAppInterfaceRequest::IsWhiteSpaceExist() {
-  LOG4CXX_INFO(logger_, "RegisterAppInterfaceRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   str = (*message_)[strings::msg_params][strings::app_name].asCharArray();
diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc
index fe6f3a925a..4bf3dbf913 100644
--- a/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc
+++ b/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc
@@ -42,7 +42,7 @@ namespace application_manager {
 namespace commands {
 
 void RegisterAppInterfaceResponse::Run() {
-  LOG4CXX_INFO(logger_, "RegisterAppInterfaceResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   mobile_apis::Result::eType result_code = mobile_apis::Result::INVALID_ENUM;
   bool success = (*message_)[strings::msg_params][strings::success].asBool();
@@ -75,7 +75,7 @@ void RegisterAppInterfaceResponse::Run() {
 
 void RegisterAppInterfaceResponse::SetHeartBeatTimeout(
     uint32_t connection_key, const std::string& mobile_app_id) {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   policy::PolicyHandler *policy_handler = policy::PolicyHandler::instance();
   if (policy_handler->PolicyEnabled()) {
     const int32_t timeout = policy_handler->HeartBeatTimeout(mobile_app_id);
@@ -86,7 +86,6 @@ void RegisterAppInterfaceResponse::SetHeartBeatTimeout(
   } else {
     LOG4CXX_INFO(logger_, "Policy is turn off");
   }
-  LOG4CXX_TRACE_EXIT(logger_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc
index 5e62b789d8..df224f9f3c 100644
--- a/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc
+++ b/src/components/application_manager/src/commands/mobile/reset_global_properties_request.cc
@@ -58,7 +58,7 @@ ResetGlobalPropertiesRequest::~ResetGlobalPropertiesRequest() {
 }
 
 void ResetGlobalPropertiesRequest::Run() {
-  LOG4CXX_INFO(logger_, "ResetGlobalPropertiesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   uint32_t app_id = (*message_)[strings::params][strings::connection_key].asUInt();
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id);
@@ -236,7 +236,7 @@ bool ResetGlobalPropertiesRequest::ResetVrHelpTitleItems(
 }
 
 void ResetGlobalPropertiesRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "ResetGlobalPropertiesRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc b/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc
index aeacabf9d5..8e562956ae 100644
--- a/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc
+++ b/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc
@@ -47,7 +47,7 @@ ResetGlobalPropertiesResponse::~ResetGlobalPropertiesResponse() {
 }
 
 void ResetGlobalPropertiesResponse::Run() {
-  LOG4CXX_INFO(logger_, "ResetGlobalPropertiesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/scrollable_message_request.cc b/src/components/application_manager/src/commands/mobile/scrollable_message_request.cc
index 5b3cfa67ac..e91d389016 100644
--- a/src/components/application_manager/src/commands/mobile/scrollable_message_request.cc
+++ b/src/components/application_manager/src/commands/mobile/scrollable_message_request.cc
@@ -68,7 +68,7 @@ bool ScrollableMessageRequest::Init() {
 }
 
 void ScrollableMessageRequest::Run() {
-  LOG4CXX_INFO(logger_, "ScrollableMessageRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = application_manager::ApplicationManagerImpl::instance()
       ->application((*message_)[strings::params][strings::connection_key].asUInt());
@@ -113,7 +113,7 @@ void ScrollableMessageRequest::Run() {
 }
 
 void ScrollableMessageRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "ScrollableMessageRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc b/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc
index d9692359d0..212a3ba912 100644
--- a/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc
+++ b/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc
@@ -46,7 +46,7 @@ ScrollableMessageResponse::ScrollableMessageResponse(
 }
 
 void ScrollableMessageResponse::Run() {
-  LOG4CXX_INFO(logger_, "ScrollableMessageResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   mobile_apis::Result::eType result_code = static_cast<mobile_apis::Result::eType>(
       (*message_)[strings::msg_params][strings::result_code].asInt());
   ApplicationSharedPtr application =
diff --git a/src/components/application_manager/src/commands/mobile/send_location_request.cc b/src/components/application_manager/src/commands/mobile/send_location_request.cc
index b5c2e8a9a5..b47161612b 100644
--- a/src/components/application_manager/src/commands/mobile/send_location_request.cc
+++ b/src/components/application_manager/src/commands/mobile/send_location_request.cc
@@ -46,7 +46,7 @@ SendLocationRequest::~SendLocationRequest() {
 }
 
 void SendLocationRequest::Run() {
-  LOG4CXX_INFO(logger_, "SendLocationRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = application_manager::ApplicationManagerImpl::instance()
       ->application(connection_key());
diff --git a/src/components/application_manager/src/commands/mobile/send_location_response.cc b/src/components/application_manager/src/commands/mobile/send_location_response.cc
index a13b67dc06..32756c999d 100644
--- a/src/components/application_manager/src/commands/mobile/send_location_response.cc
+++ b/src/components/application_manager/src/commands/mobile/send_location_response.cc
@@ -48,7 +48,7 @@ SendLocationResponse::~SendLocationResponse() {
 }
 
 void SendLocationResponse::Run() {
-  LOG4CXX_INFO(logger_, "SendLocationResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc b/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc
index 60a2583287..b59a631d8d 100644
--- a/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc
+++ b/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc
@@ -49,7 +49,7 @@ SetDisplayLayoutRequest::~SetDisplayLayoutRequest() {
 }
 
 void SetDisplayLayoutRequest::Run() {
-  LOG4CXX_INFO(logger_, "SetDisplayLayoutRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   ApplicationConstSharedPtr app = ApplicationManagerImpl::instance()
   ->application(connection_key());
 
@@ -66,7 +66,7 @@ void SetDisplayLayoutRequest::Run() {
 }
 
 void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "SetDisplayLayoutRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const smart_objects::SmartObject& message = event.smart_object();
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc b/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc
index 51f8c1f35b..3844b3bf05 100644
--- a/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc
+++ b/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc
@@ -48,7 +48,7 @@ SetDisplayLayoutResponse::~SetDisplayLayoutResponse() {
 }
 
 void SetDisplayLayoutResponse::Run() {
-  LOG4CXX_INFO(logger_, "SetDisplayLayoutResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 
diff --git a/src/components/application_manager/src/commands/mobile/set_global_properties_request.cc b/src/components/application_manager/src/commands/mobile/set_global_properties_request.cc
index f7216c818c..ff46e041ff 100644
--- a/src/components/application_manager/src/commands/mobile/set_global_properties_request.cc
+++ b/src/components/application_manager/src/commands/mobile/set_global_properties_request.cc
@@ -59,7 +59,7 @@ SetGlobalPropertiesRequest::~SetGlobalPropertiesRequest() {
 }
 
 void SetGlobalPropertiesRequest::Run() {
-  LOG4CXX_INFO(logger_, "SetGlobalPropertiesRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const smart_objects::SmartObject& msg_params =
       (*message_)[strings::msg_params];
@@ -197,7 +197,8 @@ void SetGlobalPropertiesRequest::Run() {
     SendHMIRequest(hmi_apis::FunctionID::UI_SetGlobalProperties,
                        &params, true);
   } else if (!is_vr_help_title_present && !is_vr_help_present) {
-    const CommandsMap& cmdMap = app->commands_map();
+    const DataAccessor<CommandsMap> accessor = app->commands_map();
+    const CommandsMap& cmdMap = accessor.GetData();
     CommandsMap::const_iterator command_it = cmdMap.begin();
 
     int32_t index = 0;
@@ -304,7 +305,7 @@ bool SetGlobalPropertiesRequest::CheckVrHelpItemsOrder() {
 }
 
 void SetGlobalPropertiesRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "SetGlobalPropertiesRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(CommandRequestImpl::connection_key());
@@ -383,7 +384,7 @@ bool SetGlobalPropertiesRequest::ValidateConditionalMandatoryParameters(
 }
 
 bool SetGlobalPropertiesRequest::IsWhiteSpaceExist() {
-  LOG4CXX_INFO(logger_, "SetGlobalPropertiesRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str;
 
   const smart_objects::SmartObject& msg_params =
diff --git a/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc b/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc
index 5f0b62fb4d..759333385d 100644
--- a/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc
+++ b/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc
@@ -48,7 +48,7 @@ SetGlobalPropertiesResponse::~SetGlobalPropertiesResponse() {
 }
 
 void SetGlobalPropertiesResponse::Run() {
-  LOG4CXX_INFO(logger_, "SetGlobalPropertiesResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/set_icon_request.cc b/src/components/application_manager/src/commands/mobile/set_icon_request.cc
index 4b06730752..248367e9b3 100644
--- a/src/components/application_manager/src/commands/mobile/set_icon_request.cc
+++ b/src/components/application_manager/src/commands/mobile/set_icon_request.cc
@@ -51,7 +51,7 @@ SetIconRequest::~SetIconRequest() {
 }
 
 void SetIconRequest::Run() {
-  LOG4CXX_INFO(logger_, "SetIconRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app =
       ApplicationManagerImpl::instance()->application(connection_key());
@@ -102,7 +102,7 @@ void SetIconRequest::Run() {
 }
 
 void SetIconRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "SetIconRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
@@ -117,6 +117,11 @@ void SetIconRequest::on_event(const event_engine::Event& event) {
         ApplicationSharedPtr app =
             ApplicationManagerImpl::instance()->application(connection_key());
 
+        if (!message_.valid() || !app.valid()) {
+           LOG4CXX_ERROR(logger_, "NULL pointer.");
+           return;
+        }
+
         const std::string path = (*message_)[strings::msg_params]
                                             [strings::sync_file_name]
                                             [strings::value].asString();
diff --git a/src/components/application_manager/src/commands/mobile/set_icon_response.cc b/src/components/application_manager/src/commands/mobile/set_icon_response.cc
index f1580823d1..632677a4fc 100644
--- a/src/components/application_manager/src/commands/mobile/set_icon_response.cc
+++ b/src/components/application_manager/src/commands/mobile/set_icon_response.cc
@@ -46,7 +46,7 @@ SetIconResponse::~SetIconResponse() {
 }
 
 void SetIconResponse::Run() {
-  LOG4CXX_INFO(logger_, "SetIconResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_request.cc b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_request.cc
index c9b2eb5ef5..536bb755ed 100644
--- a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_request.cc
+++ b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_request.cc
@@ -49,7 +49,7 @@ SetMediaClockRequest::~SetMediaClockRequest() {
 }
 
 void SetMediaClockRequest::Run() {
-  LOG4CXX_INFO(logger_, "SetMediaClockRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app =
       ApplicationManagerImpl::instance()->application(connection_key());
@@ -81,7 +81,7 @@ void SetMediaClockRequest::Run() {
 }
 
 void SetMediaClockRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "SetMediaClockRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
diff --git a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc
index 73923b0021..da6f204da4 100644
--- a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc
+++ b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc
@@ -47,7 +47,7 @@ SetMediaClockTimerResponse::~SetMediaClockTimerResponse() {
 }
 
 void SetMediaClockTimerResponse::Run() {
-  LOG4CXX_INFO(logger_, "SetMediaClockTimerResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/show_constant_tbt_request.cc b/src/components/application_manager/src/commands/mobile/show_constant_tbt_request.cc
index f4e70c53ac..1e861d14ce 100644
--- a/src/components/application_manager/src/commands/mobile/show_constant_tbt_request.cc
+++ b/src/components/application_manager/src/commands/mobile/show_constant_tbt_request.cc
@@ -51,7 +51,7 @@ ShowConstantTBTRequest::~ShowConstantTBTRequest() {
 }
 
 void ShowConstantTBTRequest::Run() {
-  LOG4CXX_INFO(logger_, "ShowConstantTBTRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::params][strings::connection_key].asUInt());
@@ -175,7 +175,7 @@ void ShowConstantTBTRequest::Run() {
 
 
 void ShowConstantTBTRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "ShowConstantTBTRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
@@ -206,7 +206,7 @@ void ShowConstantTBTRequest::on_event(const event_engine::Event& event) {
 }
 
 bool ShowConstantTBTRequest::IsWhiteSpaceExist() {
-  LOG4CXX_INFO(logger_, "ShowConstantTBTRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   if ((*message_)[strings::msg_params].keyExists(strings::turn_icon)) {
diff --git a/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc b/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc
index d5539d148c..e45cd760df 100644
--- a/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc
+++ b/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc
@@ -48,7 +48,7 @@ ShowConstantTBTResponse::~ShowConstantTBTResponse() {
 }
 
 void ShowConstantTBTResponse::Run() {
-  LOG4CXX_INFO(logger_, "ShowConstantTBTResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/show_request.cc b/src/components/application_manager/src/commands/mobile/show_request.cc
index eeef60101e..0a136e0ac2 100644
--- a/src/components/application_manager/src/commands/mobile/show_request.cc
+++ b/src/components/application_manager/src/commands/mobile/show_request.cc
@@ -50,7 +50,7 @@ ShowRequest::~ShowRequest() {
 }
 
 void ShowRequest::Run() {
-  LOG4CXX_INFO(logger_, "ShowRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = application_manager::ApplicationManagerImpl::instance()
       ->application(
@@ -216,7 +216,7 @@ void ShowRequest::Run() {
 }
 
 void ShowRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "ShowRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
@@ -251,7 +251,7 @@ void ShowRequest::on_event(const event_engine::Event& event) {
 }
 
 bool ShowRequest::CheckStringsOfShowRequest() {
-  LOG4CXX_INFO(logger_, "ShowRequest::CheckStringsOfShowRequest");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str;
 
   if ((*message_)[strings::msg_params].keyExists(strings::main_field_4)) {
diff --git a/src/components/application_manager/src/commands/mobile/show_response.cc b/src/components/application_manager/src/commands/mobile/show_response.cc
index 1f9c59c6fc..0c46cdd83c 100644
--- a/src/components/application_manager/src/commands/mobile/show_response.cc
+++ b/src/components/application_manager/src/commands/mobile/show_response.cc
@@ -48,7 +48,7 @@ ShowResponse::~ShowResponse() {
 }
 
 void ShowResponse::Run() {
-  LOG4CXX_INFO(logger_, "ShowResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/slider_request.cc b/src/components/application_manager/src/commands/mobile/slider_request.cc
index 52f3c7dee7..4a0a72ee49 100644
--- a/src/components/application_manager/src/commands/mobile/slider_request.cc
+++ b/src/components/application_manager/src/commands/mobile/slider_request.cc
@@ -60,7 +60,7 @@ bool SliderRequest::Init() {
 }
 
 void SliderRequest::Run() {
-  LOG4CXX_INFO(logger_, "SliderRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr application =
       application_manager::ApplicationManagerImpl::instance()->application(
@@ -110,7 +110,7 @@ void SliderRequest::Run() {
 }
 
 void SliderRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "SliderRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   const event_engine::Event::EventID event_id = event.id();
diff --git a/src/components/application_manager/src/commands/mobile/slider_response.cc b/src/components/application_manager/src/commands/mobile/slider_response.cc
index bfb6b0a1e6..7f0c10b068 100644
--- a/src/components/application_manager/src/commands/mobile/slider_response.cc
+++ b/src/components/application_manager/src/commands/mobile/slider_response.cc
@@ -46,7 +46,7 @@ SliderResponse::~SliderResponse() {
 }
 
 void SliderResponse::Run() {
-  LOG4CXX_INFO(logger_, "SliderResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/speak_request.cc b/src/components/application_manager/src/commands/mobile/speak_request.cc
index de37e8b49e..7878e9645b 100644
--- a/src/components/application_manager/src/commands/mobile/speak_request.cc
+++ b/src/components/application_manager/src/commands/mobile/speak_request.cc
@@ -49,7 +49,7 @@ SpeakRequest::~SpeakRequest() {
 }
 
 void SpeakRequest::Run() {
-  LOG4CXX_INFO(logger_, "SpeakRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = application_manager::ApplicationManagerImpl::instance()
                      ->application(connection_key());
@@ -76,7 +76,7 @@ void SpeakRequest::Run() {
 }
 
 void SpeakRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "SpeakRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   switch (event.id()) {
     case hmi_apis::FunctionID::TTS_Speak: {
       LOG4CXX_INFO(logger_, "Received TTS_Speak event");
@@ -100,7 +100,7 @@ void SpeakRequest::on_event(const event_engine::Event& event) {
 
 void SpeakRequest::ProcessTTSSpeakResponse(
   const smart_objects::SmartObject& message) {
-  LOG4CXX_INFO(logger_, "SpeakRequest::ProcessTTSSpeakResponse");
+  LOG4CXX_AUTO_TRACE(logger_);
   ApplicationSharedPtr application = ApplicationManagerImpl::instance()->application(
                                connection_key());
 
@@ -134,7 +134,7 @@ void SpeakRequest::ProcessTTSSpeakResponse(
 }
 
 bool SpeakRequest::IsWhiteSpaceExist() {
-  LOG4CXX_INFO(logger_, "SpeakRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   if ((*message_)[strings::msg_params].keyExists(strings::tts_chunks)) {
diff --git a/src/components/application_manager/src/commands/mobile/speak_response.cc b/src/components/application_manager/src/commands/mobile/speak_response.cc
index 92b85bbb84..d99b1d0952 100644
--- a/src/components/application_manager/src/commands/mobile/speak_response.cc
+++ b/src/components/application_manager/src/commands/mobile/speak_response.cc
@@ -48,7 +48,7 @@ SpeakResponse::~SpeakResponse() {
 }
 
 void SpeakResponse::Run() {
-  LOG4CXX_INFO(logger_, "SpeakResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc b/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc
index b6a4d8a28e..abd0662547 100644
--- a/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc
+++ b/src/components/application_manager/src/commands/mobile/subscribe_button_request.cc
@@ -48,7 +48,7 @@ SubscribeButtonRequest::~SubscribeButtonRequest() {
 }
 
 void SubscribeButtonRequest::Run() {
-  LOG4CXX_INFO(logger_, "SubscribeButtonRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app =
       ApplicationManagerImpl::instance()->application(connection_key());
diff --git a/src/components/application_manager/src/commands/mobile/subscribe_button_response.cc b/src/components/application_manager/src/commands/mobile/subscribe_button_response.cc
index 6253f8ca3d..a3452ef19f 100644
--- a/src/components/application_manager/src/commands/mobile/subscribe_button_response.cc
+++ b/src/components/application_manager/src/commands/mobile/subscribe_button_response.cc
@@ -46,7 +46,7 @@ SubscribeButtonResponse::~SubscribeButtonResponse() {
 }
 
 void SubscribeButtonResponse::Run() {
-  LOG4CXX_INFO(logger_, "SubscribeButtonResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // check if response false
   if (true == (*message_)[strings::msg_params].keyExists(strings::success)) {
diff --git a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
index 35595c2df6..1640f0b497 100644
--- a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
@@ -84,7 +84,7 @@ namespace {
 #endif // #ifdef HMI_DBUS_API
 
 void SubscribeVehicleDataRequest::Run() {
-  LOG4CXX_INFO(logger_, "SubscribeVehicleDataRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       CommandRequestImpl::connection_key());
@@ -172,7 +172,7 @@ void SubscribeVehicleDataRequest::Run() {
 }
 
 void SubscribeVehicleDataRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "SubscribeVehicleDataRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const smart_objects::SmartObject& message = event.smart_object();
 
diff --git a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc
index 972a654188..c0554c62eb 100644
--- a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc
+++ b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc
@@ -48,7 +48,7 @@ SubscribeVehicleDataResponse::~SubscribeVehicleDataResponse() {
 }
 
 void SubscribeVehicleDataResponse::Run() {
-  LOG4CXX_INFO(logger_, "SubscribeVehicleDataResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
 
diff --git a/src/components/application_manager/src/commands/mobile/system_request.cc b/src/components/application_manager/src/commands/mobile/system_request.cc
index 2765aad8d7..1f5ea52e54 100644
--- a/src/components/application_manager/src/commands/mobile/system_request.cc
+++ b/src/components/application_manager/src/commands/mobile/system_request.cc
@@ -55,7 +55,7 @@ SystemRequest::~SystemRequest() {
 }
 
 void SystemRequest::Run() {
-  LOG4CXX_INFO(logger_, "SystemRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr application =
       ApplicationManagerImpl::instance()->application(connection_key());
diff --git a/src/components/application_manager/src/commands/mobile/system_response.cc b/src/components/application_manager/src/commands/mobile/system_response.cc
index e77ab08450..8b4fdafd1b 100644
--- a/src/components/application_manager/src/commands/mobile/system_response.cc
+++ b/src/components/application_manager/src/commands/mobile/system_response.cc
@@ -46,7 +46,7 @@ SystemResponse::~SystemResponse() {
 }
 
 void SystemResponse::Run() {
-  LOG4CXX_INFO(logger_, "SystemResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc
index a07cfcd8f0..6199818dbe 100644
--- a/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc
+++ b/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc
@@ -40,7 +40,7 @@ namespace application_manager {
 namespace commands {
 
 void UnregisterAppInterfaceRequest::Run() {
-  LOG4CXX_INFO(logger_, "UnregisterAppInterfaceRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl* app_manager = ApplicationManagerImpl::instance();
 
diff --git a/src/components/application_manager/src/commands/mobile/unregister_app_interface_response.cc b/src/components/application_manager/src/commands/mobile/unregister_app_interface_response.cc
index 8ef0eb3ed0..49d9276d35 100644
--- a/src/components/application_manager/src/commands/mobile/unregister_app_interface_response.cc
+++ b/src/components/application_manager/src/commands/mobile/unregister_app_interface_response.cc
@@ -38,7 +38,7 @@ namespace application_manager {
 namespace commands {
 
 void UnregisterAppInterfaceResponse::Run() {
-  LOG4CXX_INFO(logger_, "UnregisterAppInterfaceResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SendResponse((*message_)[strings::msg_params][strings::success].asBool());
 }
diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc
index f22d1c0a2f..08a27dedfa 100644
--- a/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc
+++ b/src/components/application_manager/src/commands/mobile/unsubscribe_button_request.cc
@@ -50,7 +50,7 @@ UnsubscribeButtonRequest::~UnsubscribeButtonRequest() {
 }
 
 void UnsubscribeButtonRequest::Run() {
-  LOG4CXX_INFO(logger_, "UnsubscribeButtonRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[str::params][str::connection_key].asUInt());
diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_button_response.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_button_response.cc
index 1331eac27f..8bece66157 100644
--- a/src/components/application_manager/src/commands/mobile/unsubscribe_button_response.cc
+++ b/src/components/application_manager/src/commands/mobile/unsubscribe_button_response.cc
@@ -47,7 +47,7 @@ UnsubscribeButtonResponse::~UnsubscribeButtonResponse() {
 }
 
 void UnsubscribeButtonResponse::Run() {
-  LOG4CXX_INFO(logger_, "UnsubscribeButtonResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   namespace smart_objects = NsSmartDeviceLink::NsSmartObjects;
 
diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc
index fc7145078f..7d05ce328f 100644
--- a/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc
@@ -88,7 +88,7 @@ namespace {
 #endif // #ifdef HMI_DBUS_API
 
 void UnsubscribeVehicleDataRequest::Run() {
-  LOG4CXX_INFO(logger_, "UnsubscribeVehicleDataRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       CommandRequestImpl::connection_key());
@@ -176,7 +176,7 @@ void UnsubscribeVehicleDataRequest::Run() {
 }
 
 void UnsubscribeVehicleDataRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "UnsubscribeVehicleDataRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   const smart_objects::SmartObject& message = event.smart_object();
 
diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_response.cc
index 60f7077da7..87b2e6e5e1 100644
--- a/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_response.cc
+++ b/src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_response.cc
@@ -45,7 +45,7 @@ UnsubscribeVehicleDataResponse::~UnsubscribeVehicleDataResponse() {
 }
 
 void UnsubscribeVehicleDataResponse::Run() {
-  LOG4CXX_INFO(logger_, "UnsubscribeVehicleDataResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   namespace smart_objects = NsSmartDeviceLink::NsSmartObjects;
 
diff --git a/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc b/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc
index 9447772568..650e698bf4 100644
--- a/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc
+++ b/src/components/application_manager/src/commands/mobile/update_turn_list_request.cc
@@ -51,7 +51,7 @@ UpdateTurnListRequest::~UpdateTurnListRequest() {
 }
 
 void UpdateTurnListRequest::Run() {
-  LOG4CXX_INFO(logger_, "UpdateTurnListRequest::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
       (*message_)[strings::params][strings::connection_key].asUInt());
@@ -141,7 +141,7 @@ void UpdateTurnListRequest::Run() {
 }
 
 void UpdateTurnListRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "UpdateTurnListRequest::on_event");
+  LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
 
   switch (event.id()) {
@@ -188,7 +188,7 @@ bool UpdateTurnListRequest::CheckTurnListArray() {
 }
 
 bool UpdateTurnListRequest::IsWhiteSpaceExist() {
-  LOG4CXX_INFO(logger_, "UpdateTurnListRequest::IsWhiteSpaceExist");
+  LOG4CXX_AUTO_TRACE(logger_);
   const char* str = NULL;
 
   if ((*message_)[strings::msg_params].keyExists(strings::turn_list)) {
diff --git a/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc b/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc
index ec1e0bce8a..26e5c460d3 100644
--- a/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc
+++ b/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc
@@ -47,7 +47,7 @@ UpdateTurnListResponse::~UpdateTurnListResponse() {
 }
 
 void UpdateTurnListResponse::Run() {
-  LOG4CXX_INFO(logger_, "UpdateTurnListResponse::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationManagerImpl::instance()->SendMessageToMobile(message_);
 }
diff --git a/src/components/application_manager/src/hmi_capabilities.cc b/src/components/application_manager/src/hmi_capabilities.cc
index 5a3ce71ec6..14213558d3 100644
--- a/src/components/application_manager/src/hmi_capabilities.cc
+++ b/src/components/application_manager/src/hmi_capabilities.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/src/message.cc b/src/components/application_manager/src/message.cc
index 832016e874..bb500687dd 100644
--- a/src/components/application_manager/src/message.cc
+++ b/src/components/application_manager/src/message.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/src/message_helper.cc b/src/components/application_manager/src/message_helper.cc
index ffde928db6..8ac9de416e 100644
--- a/src/components/application_manager/src/message_helper.cc
+++ b/src/components/application_manager/src/message_helper.cc
@@ -384,13 +384,15 @@ smart_objects::SmartObject* MessageHelper::GetHashUpdateNotification(
 }
 
 void MessageHelper::SendHashUpdateNotification(const uint32_t app_id) {
-  LOG4CXX_INFO(logger_, "SendHashUpdateNotification");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   smart_objects::SmartObject* so = GetHashUpdateNotification(app_id);
   if (so) {
     PrintSmartObject(*so);
     if (!ApplicationManagerImpl::instance()->ManageMobileCommand(so)) {
       LOG4CXX_ERROR_EXT(logger_, "Failed to send HashUpdate notification.");
+    } else {
+      ApplicationManagerImpl::instance()->resume_controller().ApplicationsDataUpdated();
     }
   }
 }
@@ -446,6 +448,7 @@ std::string MessageHelper::StringifiedHMILevel(
 
 std::string MessageHelper::StringifiedFunctionID(
   mobile_apis::FunctionID::eType function_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
   using namespace NsSmartDeviceLink::NsSmartObjects;
   const char* str = 0;
   if (EnumConversionHelper<mobile_apis::FunctionID::eType>::EnumToCString(
@@ -495,6 +498,7 @@ static std::map<std::string, uint16_t> vehicle_data_args = create_get_vehicle_da
 #endif
 
 void MessageHelper::CreateGetVehicleDataRequest(uint32_t correlation_id, const std::vector<std::string>& params) {
+  LOG4CXX_AUTO_TRACE(logger_);
 #ifdef HMI_DBUS_API
   for (std::vector<std::string>::const_iterator it = params.begin();
        it != params.end(); it++) {
@@ -534,10 +538,8 @@ smart_objects::SmartObject* MessageHelper::CreateBlockedByPoliciesResponse(
   mobile_apis::FunctionID::eType function_id,
   mobile_apis::Result::eType result, uint32_t correlation_id,
   uint32_t connection_key) {
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject* response = new smart_objects::SmartObject;
-  if (!response) {
-    return NULL;
-  }
 
   (*response)[strings::params][strings::function_id] =
     static_cast<int>(function_id);
@@ -557,13 +559,10 @@ smart_objects::SmartObject* MessageHelper::CreateBlockedByPoliciesResponse(
 
 smart_objects::SmartObject* MessageHelper::CreateDeviceListSO(
   const connection_handler::DeviceMap& devices) {
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject* device_list_so = new smart_objects::SmartObject(
     smart_objects::SmartType_Map);
 
-  if (NULL == device_list_so) {
-    return NULL;
-  }
-
   (*device_list_so)[strings::device_list] = smart_objects::SmartObject(
         smart_objects::SmartType_Array);
   smart_objects::SmartObject& list_so = (*device_list_so)[strings::device_list];
@@ -580,13 +579,14 @@ smart_objects::SmartObject* MessageHelper::CreateDeviceListSO(
         policy::PolicyHandler::instance()->GetUserConsentForDevice(it->second.mac_address());
     list_so[index][strings::isSDLAllowed] =
         policy::DeviceConsent::kDeviceAllowed == device_consent;
+    ++index;
   }
-  ++index;
   return device_list_so;
 }
 
 smart_objects::SmartObject* MessageHelper::CreateModuleInfoSO(
   uint32_t function_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject* module_info = new smart_objects::SmartObject(
     smart_objects::SmartType_Map);
   smart_objects::SmartObject& object = *module_info;
@@ -601,6 +601,7 @@ smart_objects::SmartObject* MessageHelper::CreateModuleInfoSO(
 
 smart_objects::SmartObject* MessageHelper::CreateSetAppIcon(
   const std::string& path_to_icon, uint32_t app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject* set_icon = new smart_objects::SmartObject(
     smart_objects::SmartType_Map);
 
@@ -619,34 +620,40 @@ smart_objects::SmartObject* MessageHelper::CreateSetAppIcon(
 }
 
 bool MessageHelper::SendIVISubscribtions(const uint32_t app_id) {
-  LOG4CXX_INFO(logger_, " MessageHelper::SendIVISubscribtions ");
+  LOG4CXX_AUTO_TRACE(logger_);
 
-  bool succes = true;
+  bool result = true;
   ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
                                app_id);
-  DCHECK(app.get());
 
-  SmartObjectList requests = GetIVISubscribtionRequests(app_id);
+  if (!app.valid()) {
+    LOG4CXX_ERROR(logger_, "Invalid application " << app_id);
+    return result;
+  }
+
+  SmartObjectList requests = GetIVISubscriptionRequests(app);
   for (SmartObjectList::const_iterator it = requests.begin();
        it != requests.end(); ++it) {
     if (!ApplicationManagerImpl::instance()->ManageHMICommand(*it)) {
-      succes = false;
+      result = false;
     }
   }
-  return succes;
+  return result;
 }
 
-MessageHelper::SmartObjectList MessageHelper::GetIVISubscribtionRequests(
-  const uint32_t app_id) {
-  LOG4CXX_INFO(logger_, " MessageHelper::GetIVISubscribtionRequests ");
+MessageHelper::SmartObjectList MessageHelper::GetIVISubscriptionRequests(
+  ApplicationSharedPtr app) {
+  LOG4CXX_AUTO_TRACE(logger_);
 
-  ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
-                               app_id);
-  DCHECK(app);
+  SmartObjectList hmi_requests;
+  if (!app.valid()) {
+    LOG4CXX_ERROR(logger_, "Invalid application pointer ");
+    return hmi_requests;
+  }
 
   smart_objects::SmartObject msg_params = smart_objects::SmartObject(
       smart_objects::SmartType_Map);
-  msg_params[strings::app_id] = app_id;
+  msg_params[strings::app_id] = app->app_id();
   const VehicleData& vehicle_data = MessageHelper::vehicle_data_;
   VehicleData::const_iterator ivi_it = vehicle_data.begin();
   const std::set<uint32_t>& subscribes = app->SubscribesIVI();
@@ -659,7 +666,6 @@ MessageHelper::SmartObjectList MessageHelper::GetIVISubscribtionRequests(
     }
   }
 
-  SmartObjectList hmi_requests;
 #ifdef HMI_JSON_API
   smart_objects::SmartObject* request = MessageHelper::CreateModuleInfoSO(
                                           hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData);
@@ -683,6 +689,7 @@ MessageHelper::SmartObjectList MessageHelper::GetIVISubscribtionRequests(
 }
 
 void MessageHelper::SendAppDataToHMI(ApplicationConstSharedPtr app) {
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t id = app->app_id();
 
   utils::SharedPtr<smart_objects::SmartObject> set_app_icon(
@@ -702,7 +709,7 @@ void MessageHelper::SendAppDataToHMI(ApplicationConstSharedPtr app) {
 
     so_to_send[strings::msg_params] = smart_objects::SmartObject(
                                         smart_objects::SmartType_Map);
-    smart_objects::SmartObject* msg_params = MessageHelper::CreateSetAppIcon(
+    utils::SharedPtr<smart_objects::SmartObject> msg_params = MessageHelper::CreateSetAppIcon(
           app->app_icon_path(), id);
 
     if (msg_params) {
@@ -717,7 +724,10 @@ void MessageHelper::SendAppDataToHMI(ApplicationConstSharedPtr app) {
 }
 
 void MessageHelper::SendGlobalPropertiesToHMI(ApplicationConstSharedPtr app) {
-  DCHECK(app.get());
+  if (!app.valid()) {
+    LOG4CXX_ERROR(logger_, "Invalid application");
+    return;
+  }
 
   SmartObjectList requests = CreateGlobalPropertiesRequestsToHMI(app);
   for (SmartObjectList::const_iterator it = requests.begin();
@@ -728,9 +738,13 @@ void MessageHelper::SendGlobalPropertiesToHMI(ApplicationConstSharedPtr app) {
 
 MessageHelper::SmartObjectList MessageHelper::CreateGlobalPropertiesRequestsToHMI(
   ApplicationConstSharedPtr app) {
+  LOG4CXX_AUTO_TRACE(logger_);
 
   SmartObjectList requests;
-  DCHECK(app.get());
+  if (!app.valid()) {
+    LOG4CXX_ERROR(logger_, "Invalid application");
+    return requests;
+  }
 
   // UI global properties
 
@@ -816,6 +830,7 @@ MessageHelper::SmartObjectList MessageHelper::CreateGlobalPropertiesRequestsToHM
 
 void MessageHelper::SendTTSGlobalProperties(
     ApplicationSharedPtr app, bool default_help_prompt) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!app.valid()) {
     return;
   }
@@ -838,7 +853,8 @@ void MessageHelper::SendTTSGlobalProperties(
     msg_params[strings::help_prompt] = smart_objects::SmartObject(
         smart_objects::SmartType_Array);
     if (default_help_prompt) {
-      const CommandsMap& commands = app->commands_map();
+      const DataAccessor<CommandsMap> accessor = app->commands_map();
+      const CommandsMap& commands = accessor.GetData();
       CommandsMap::const_iterator it = commands.begin();
       uint32_t index = 0;
       for (; commands.end() != it; ++it) {
@@ -884,7 +900,8 @@ smart_objects::SmartObject* MessageHelper::CreateAppVrHelp(
   }
 
   // copy all app VR commands
-  const CommandsMap& commands = app->commands_map();
+  const DataAccessor<CommandsMap> cmd_accessor = app->commands_map();
+  const CommandsMap& commands = cmd_accessor.GetData();
   CommandsMap::const_iterator it = commands.begin();
 
   for (; commands.end() != it; ++it) {
@@ -898,12 +915,16 @@ smart_objects::SmartObject* MessageHelper::CreateAppVrHelp(
 
 MessageHelper::SmartObjectList MessageHelper::CreateShowRequestToHMI(
   ApplicationConstSharedPtr app) {
-  DCHECK(app.get());
 
   SmartObjectList requests;
-  smart_objects::SmartObject* ui_show = new smart_objects::SmartObject(
-    smart_objects::SmartType_Map);
+  if (!app) {
+    LOG4CXX_ERROR(logger_, "Invalid application");
+    return requests;
+  }
+
   if (app->show_command()) {
+    smart_objects::SmartObject* ui_show = new smart_objects::SmartObject(
+        smart_objects::SmartType_Map);
     (*ui_show)[strings::params][strings::function_id] =
       static_cast<int>(hmi_apis::FunctionID::UI_Show);
     (*ui_show)[strings::params][strings::message_type] =
@@ -939,14 +960,12 @@ void MessageHelper::SendShowConstantTBTRequestToHMI(
     return;
   }
 
-  smart_objects::SmartObject* navi_show_tbt = new smart_objects::SmartObject(
-    smart_objects::SmartType_Map);
-
-  if (!navi_show_tbt) {
-    return;
-  }
-
   if (app->tbt_show_command()) {
+    utils::SharedPtr<smart_objects::SmartObject> navi_show_tbt = new smart_objects::SmartObject(
+        smart_objects::SmartType_Map);
+    if (!navi_show_tbt) {
+      return;
+    }
     (*navi_show_tbt)[strings::params][strings::function_id] =
       static_cast<int>(hmi_apis::FunctionID::Navigation_ShowConstantTBT);
     (*navi_show_tbt)[strings::params][strings::message_type] =
@@ -975,10 +994,15 @@ void MessageHelper::SendAddCommandRequestToHMI(ApplicationConstSharedPtr app) {
 
 MessageHelper::SmartObjectList MessageHelper::CreateAddCommandRequestToHMI(
   ApplicationConstSharedPtr app) {
-  DCHECK(app.get());
 
   SmartObjectList requests;
-  const CommandsMap& commands = app->commands_map();
+  if (!app.valid()) {
+    LOG4CXX_ERROR(logger_, "Invalid application");
+    return requests;
+  }
+
+  const DataAccessor<CommandsMap> accessor = app->commands_map();
+  const CommandsMap& commands = accessor.GetData();
   CommandsMap::const_iterator i = commands.begin();
   for (; commands.end() != i; ++i) {
     // UI Interface
@@ -1027,7 +1051,8 @@ MessageHelper::SmartObjectList MessageHelper::CreateAddCommandRequestToHMI(
 }
 
 smart_objects::SmartObject* MessageHelper::CreateChangeRegistration(
-  int32_t function_id, int32_t language, uint32_t app_id) {
+  int32_t function_id, int32_t language, uint32_t app_id,
+  const smart_objects::SmartObject* app_types) {
   smart_objects::SmartObject* command = new smart_objects::SmartObject(
     smart_objects::SmartType_Map);
   if (!command) {
@@ -1052,10 +1077,31 @@ smart_objects::SmartObject* MessageHelper::CreateChangeRegistration(
   msg_params[strings::language] = language;
   msg_params[strings::app_id] = app_id;
 
+  if (app_types != NULL) {
+    msg_params[strings::app_hmi_type] = *app_types;
+  }
+
   params[strings::msg_params] = msg_params;
   return command;
 }
 
+void MessageHelper::SendUIChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app) {
+  if (!app.valid()) {
+    LOG4CXX_ERROR(logger_, "Application is not valid");
+    return;
+  }
+
+  if (NULL != app->app_types()) {
+    smart_objects::SmartObject* ui_command = CreateChangeRegistration(
+        hmi_apis::FunctionID::UI_ChangeRegistration, app->ui_language(),
+        app->app_id(), app->app_types());
+
+    if (ui_command) {
+      ApplicationManagerImpl::instance()->ManageHMICommand(ui_command);
+    }
+  }
+}
+
 void MessageHelper::SendChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app) {
   if (!app.valid()) {
     return;
@@ -1171,7 +1217,11 @@ bool MessageHelper::CreateHMIApplicationStruct(ApplicationConstSharedPtr app,
 }
 
 void MessageHelper::SendAddSubMenuRequestToHMI(ApplicationConstSharedPtr app) {
-  DCHECK(app.get());
+  if (!app.valid()) {
+    LOG4CXX_ERROR(logger_, "Invalid application");
+    return;
+  }
+
   SmartObjectList requests = CreateAddSubMenuRequestToHMI(app);
   for (SmartObjectList::iterator it = requests.begin(); it != requests.end();
        ++it) {
@@ -1182,7 +1232,8 @@ void MessageHelper::SendAddSubMenuRequestToHMI(ApplicationConstSharedPtr app) {
 MessageHelper::SmartObjectList MessageHelper::CreateAddSubMenuRequestToHMI(
   ApplicationConstSharedPtr app) {
   SmartObjectList requsets;
-  const SubMenuMap& sub_menu = app->sub_menu_map();
+  const DataAccessor<SubMenuMap> accessor = app->sub_menu_map();
+  const SubMenuMap& sub_menu = accessor.GetData();
   SubMenuMap::const_iterator i = sub_menu.begin();
   for (; sub_menu.end() != i; ++i) {
     smart_objects::SmartObject* ui_sub_menu = new smart_objects::SmartObject(
@@ -1241,18 +1292,19 @@ void MessageHelper::SendOnAppUnregNotificationToHMI(
 }
 
 void MessageHelper::SendActivateAppToHMI(uint32_t const app_id,
-    hmi_apis::Common_HMILevel::eType level) {
-  smart_objects::SmartObject* message = new smart_objects::SmartObject(
-    smart_objects::SmartType_Map);
-
+    hmi_apis::Common_HMILevel::eType level,
+    bool send_policy_priority) {
   application_manager::ApplicationConstSharedPtr app =
     application_manager::ApplicationManagerImpl::instance()
     ->application(app_id);
-  if (!app.valid()) {
+  if (!app) {
     LOG4CXX_WARN(logger_, "Invalid app_id: " << app_id);
     return;
   }
 
+  utils::SharedPtr<smart_objects::SmartObject> message = new smart_objects::SmartObject(
+    smart_objects::SmartType_Map);
+
   (*message)[strings::params][strings::function_id] =
     hmi_apis::FunctionID::BasicCommunication_ActivateApp;
   (*message)[strings::params][strings::message_type] = MessageType::kRequest;
@@ -1260,23 +1312,25 @@ void MessageHelper::SendActivateAppToHMI(uint32_t const app_id,
     ApplicationManagerImpl::instance()->GetNextHMICorrelationID();
   (*message)[strings::msg_params][strings::app_id] = app_id;
 
-  std::string priority;
-  // TODO(KKolodiy): need remove method policy_manager
+  if (send_policy_priority) {
+    std::string priority;
+    // TODO(KKolodiy): need remove method policy_manager
 
-  policy::PolicyHandler::instance()->GetPriority(
+    policy::PolicyHandler::instance()->GetPriority(
         app->mobile_app_id()->asString(), &priority);
-  // According SDLAQ-CRS-2794
-  // SDL have to send ActivateApp without "proirity" parameter to HMI.
-  // in case of unconsented device
-  std::string mac_adress;
-  connection_handler::DeviceHandle device_handle = app->device();
-  connection_handler::ConnectionHandlerImpl::instance()->
-      GetDataOnDeviceID(device_handle, NULL, NULL, &mac_adress, NULL);
-
-  policy::DeviceConsent consent =
-      policy::PolicyHandler::instance()->GetUserConsentForDevice(mac_adress);
-  if (!priority.empty() && (policy::DeviceConsent::kDeviceAllowed == consent)) {
-    (*message)[strings::msg_params]["priority"] = GetPriorityCode(priority);
+    // According SDLAQ-CRS-2794
+    // SDL have to send ActivateApp without "proirity" parameter to HMI.
+    // in case of unconsented device
+    std::string mac_adress;
+    connection_handler::DeviceHandle device_handle = app->device();
+    connection_handler::ConnectionHandlerImpl::instance()->
+        GetDataOnDeviceID(device_handle, NULL, NULL, &mac_adress, NULL);
+
+    policy::DeviceConsent consent =
+        policy::PolicyHandler::instance()->GetUserConsentForDevice(mac_adress);
+    if (!priority.empty() && (policy::DeviceConsent::kDeviceAllowed == consent)) {
+      (*message)[strings::msg_params][strings::priority] = GetPriorityCode(priority);
+    }
   }
 
   // We haven't send HMI level to HMI in case it FULL.
@@ -1290,17 +1344,17 @@ void MessageHelper::SendActivateAppToHMI(uint32_t const app_id,
 
 void MessageHelper::SendOnResumeAudioSourceToHMI(const uint32_t app_id) {
   LOG4CXX_WARN(logger_, "SendOnResumeAudioSourceToHMI app_id: " << app_id);
-
-  smart_objects::SmartObject* message = new smart_objects::SmartObject(
-    smart_objects::SmartType_Map);
   application_manager::ApplicationConstSharedPtr app =
     application_manager::ApplicationManagerImpl::instance()
     ->application(app_id);
-  if (!app.valid()) {
+  if (!app) {
     LOG4CXX_WARN(logger_, "Invalid app_id: " << app_id);
     return;
   }
 
+  utils::SharedPtr<smart_objects::SmartObject> message = new smart_objects::SmartObject(
+    smart_objects::SmartType_Map);
+
   (*message)[strings::params][strings::function_id] =
     hmi_apis::FunctionID::BasicCommunication_OnResumeAudioSource;
   (*message)[strings::params][strings::message_type] = MessageType::kNotification;
@@ -1345,6 +1399,7 @@ void MessageHelper::GetDeviceInfoForApp(uint32_t connection_key,
 
 void MessageHelper::SendSDLActivateAppResponse(policy::AppPermissions& permissions,
     uint32_t correlation_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject* message = new smart_objects::SmartObject(
     smart_objects::SmartType_Map);
   if (!message) {
@@ -1391,15 +1446,6 @@ void MessageHelper::SendSDLActivateAppResponse(policy::AppPermissions& permissio
   if (permissions.appRevoked || !permissions.isSDLAllowed) {
     return;
   }
-
-  // Send HMI status notification to mobile
-  ApplicationSharedPtr app = ApplicationManagerImpl::instance()
-                             ->application_by_policy_id(permissions.application_id);
-  if (app) {
-    ApplicationManagerImpl::instance()->ActivateApplication(app);
-  } else {
-    LOG4CXX_WARN(logger_, "Unable to find app_id: " << permissions.application_id);
-  }
 }
 
 void MessageHelper::SendOnSDLConsentNeeded(
@@ -1579,7 +1625,7 @@ smart_objects::SmartObject* MessageHelper::CreateNegativeResponse(
 }
 
 void MessageHelper::SendNaviStartStream(int32_t connection_key) {
-  LOG4CXX_INFO(logger_, "MessageHelper::SendNaviStartStream");
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject* start_stream = new smart_objects::SmartObject(
     smart_objects::SmartType_Map);
 
@@ -1795,10 +1841,10 @@ void MessageHelper::SendPolicySnapshotNotification(
 
 void MessageHelper::SendOnPermissionsChangeNotification(
   uint32_t connection_key, const policy::Permissions& permissions) {
-  smart_objects::SmartObject* notification = new smart_objects::SmartObject(
+  utils::SharedPtr<smart_objects::SmartObject> notification = new smart_objects::SmartObject(
     smart_objects::SmartType_Map);
   smart_objects::SmartObject& content = *notification;
-  ;
+
   content[strings::params][strings::function_id] =
     mobile_apis::FunctionID::OnPermissionsChangeID;
   content[strings::params][strings::message_type] =
@@ -1809,7 +1855,7 @@ void MessageHelper::SendOnPermissionsChangeNotification(
     commands::CommandImpl::protocol_version_;
   content[strings::params][strings::connection_key] = connection_key;
 
-  smart_objects::SmartObject* p_msg_params = new smart_objects::SmartObject(
+  utils::SharedPtr<smart_objects::SmartObject> p_msg_params = new smart_objects::SmartObject(
     smart_objects::SmartType_Map);
 
   smart_objects::SmartObject& msg_params = *p_msg_params;
@@ -2161,6 +2207,17 @@ bool MessageHelper::VerifySoftButtonString(const std::string& str) {
   return true;
 }
 
+bool MessageHelper::CheckWithPolicy(
+    int system_action, const std::string& app_mobile_id) {
+  bool result = true;
+  policy::PolicyHandler* policy_handler = policy::PolicyHandler::instance();
+  if (NULL != policy_handler && policy_handler->PolicyEnabled()) {
+    result = policy_handler->CheckKeepContext(system_action, app_mobile_id) ||
+        policy_handler->CheckStealFocus(system_action, app_mobile_id);
+  }
+  return result;
+}
+
 mobile_apis::Result::eType MessageHelper::ProcessSoftButtons(
   smart_objects::SmartObject& message_params, ApplicationConstSharedPtr app) {
   if (!message_params.keyExists(strings::soft_buttons)) {
@@ -2188,17 +2245,14 @@ mobile_apis::Result::eType MessageHelper::ProcessSoftButtons(
   smart_objects::SmartObject soft_buttons = smart_objects::SmartObject(
         smart_objects::SmartType_Array);
 
-  policy::PolicyHandler* policy_handler = policy::PolicyHandler::instance();
-  std::string app_mobile_id = app->mobile_app_id()->asString();
 
   uint32_t j = 0;
   size_t size = request_soft_buttons.length();
   for (uint32_t i = 0; i < size; ++i) {
-    int system_action = request_soft_buttons[i][strings::system_action].asInt();
-    if (!policy_handler->CheckKeepContext(system_action, app_mobile_id) ||
-        !policy_handler->CheckStealFocus(system_action, app_mobile_id)) {
+    const int system_action = request_soft_buttons[i][strings::system_action].asInt();
+
+    if (!CheckWithPolicy(system_action, app->mobile_app_id()->asString()))
       return mobile_apis::Result::DISALLOWED;
-    }
 
     switch (request_soft_buttons[i][strings::type].asInt()) {
       case mobile_apis::SoftButtonType::SBT_IMAGE: {
diff --git a/src/components/application_manager/src/mobile_message_handler.cc b/src/components/application_manager/src/mobile_message_handler.cc
index 22260e214e..cc2acfc30a 100644
--- a/src/components/application_manager/src/mobile_message_handler.cc
+++ b/src/components/application_manager/src/mobile_message_handler.cc
@@ -78,6 +78,7 @@ MobileMessageHandler::HandleIncomingMessageProtocolV1(
                 message->data_size()));
 
   if (outgoing_message->json_message().empty()) {
+    delete outgoing_message;
     return NULL;
   }
 
@@ -145,6 +146,8 @@ MobileMessageHandler::HandleOutgoingMessageProtocolV1(
   protocol_handler::RawMessage* result = new protocol_handler::RawMessage(
     message->connection_key(), 1, rawMessage, messageString.length() + 1);
 
+  delete [] rawMessage;
+
   return result;
 }
 
@@ -216,6 +219,8 @@ MobileMessageHandler::HandleOutgoingMessageProtocolV2(
                                      dataForSending,
                                      dataForSendingSize);
 
+  delete [] dataForSending;
+
   return msgToProtocolHandler;
 }
 }  // namespace application_manager
diff --git a/src/components/application_manager/src/policies/delegates/app_permission_delegate.cc b/src/components/application_manager/src/policies/delegates/app_permission_delegate.cc
new file mode 100644
index 0000000000..f6fe4b2538
--- /dev/null
+++ b/src/components/application_manager/src/policies/delegates/app_permission_delegate.cc
@@ -0,0 +1,55 @@
+/*
+ Copyright (c) 2014, Ford Motor Company
+ 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 Ford Motor Company 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 HOLDER 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 "application_manager/policies/delegates/app_permission_delegate.h"
+#include "application_manager/policies/policy_handler.h"
+
+namespace policy {
+  CREATE_LOGGERPTR_GLOBAL(logger_, "AppPermissionDelegate")
+
+  AppPermissionDelegate::AppPermissionDelegate(
+      const uint32_t connection_key, const PermissionConsent& permissions)
+    : connection_key_(connection_key),
+      permissions_(permissions) {
+  }
+
+  void AppPermissionDelegate::threadMain() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  PolicyHandler::instance()->OnAppPermissionConsentInternal(connection_key_,
+                                                            permissions_);
+}
+
+void AppPermissionDelegate::exitThreadMain() {
+  // Do nothing
+}
+
+} // namespace policy
diff --git a/src/components/application_manager/src/policies/delegates/statistics_delegate.cc b/src/components/application_manager/src/policies/delegates/statistics_delegate.cc
new file mode 100644
index 0000000000..d4335cec8c
--- /dev/null
+++ b/src/components/application_manager/src/policies/delegates/statistics_delegate.cc
@@ -0,0 +1,103 @@
+/*
+ Copyright (c) 2014, Ford Motor Company
+ 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 Ford Motor Company 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 HOLDER 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 "application_manager/policies/delegates/statistics_delegate.h"
+#include "application_manager/policies/policy_handler.h"
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "StatisticDelegate")
+namespace policy {
+  StatisticsDelegate::StatisticsDelegate(usage_statistics::GlobalCounterId type)
+    : type_(INCREMENT_GLOBAL),
+      global_counter_(type),
+      app_id_(""),
+      value_(""),
+      timespan_seconds_(0) {
+
+  }
+
+  StatisticsDelegate::StatisticsDelegate(const std::string& app_id,
+                                       usage_statistics::AppCounterId type)
+    : type_(INCREMENT_APP),
+      app_counter_(type),
+      app_id_(app_id),
+      value_(""),
+      timespan_seconds_(0) {
+
+  }
+
+  StatisticsDelegate::StatisticsDelegate(const std::string& app_id,
+                                       usage_statistics::AppInfoId type,
+                                       const std::string& value)
+    : type_(SET),
+      app_info_(type),
+      app_id_(app_id),
+      value_(value),
+      timespan_seconds_(0) {
+
+  }
+
+  StatisticsDelegate::StatisticsDelegate(const std::string& app_id,
+                                       usage_statistics::AppStopwatchId type,
+                                       int32_t timespan_seconds)
+    : type_(ADD),
+      stop_watch_(type),
+      app_id_(app_id),
+      value_(""),
+      timespan_seconds_(timespan_seconds) {
+
+  }
+
+  void StatisticsDelegate::threadMain() {
+    LOG4CXX_AUTO_TRACE(logger_);
+    switch (type_) {
+      case INCREMENT_GLOBAL:
+        PolicyHandler::instance()->Increment(global_counter_);
+        break;
+      case INCREMENT_APP:
+        PolicyHandler::instance()->Increment(app_id_, app_counter_);
+        break;
+      case SET:
+        PolicyHandler::instance()->Set(app_id_, app_info_, value_);
+        break;
+      case ADD:
+        PolicyHandler::instance()->Add(app_id_, stop_watch_, timespan_seconds_);
+        break;
+      default:
+        LOG4CXX_ERROR(logger_,"Unknown statistics operator");
+        break;
+    }
+  }
+
+  void StatisticsDelegate::exitThreadMain() {
+    // Do nothing
+  }
+} // namespace policy
diff --git a/src/components/application_manager/src/policies/policy_event_observer.cc b/src/components/application_manager/src/policies/policy_event_observer.cc
index 488097761a..09f97dd3f1 100644
--- a/src/components/application_manager/src/policies/policy_event_observer.cc
+++ b/src/components/application_manager/src/policies/policy_event_observer.cc
@@ -32,20 +32,31 @@
 
 #include "application_manager/policies/policy_event_observer.h"
 #include "application_manager/smart_object_keys.h"
+#include "application_manager/policies/policy_handler.h"
 #include "utils/date_time.h"
-#include "policy/policy_manager.h"
 #include "smart_objects/smart_object.h"
 
 namespace policy {
 namespace smart_objects = NsSmartDeviceLink::NsSmartObjects;
 using namespace application_manager;
+class PolicyHandler;
 
-PolicyEventObserver::PolicyEventObserver(utils::SharedPtr<PolicyManager> policy_manager)
-    : policy_manager_(policy_manager) {
+CREATE_LOGGERPTR_GLOBAL(logger_, "PolicyHandler")
+
+PolicyEventObserver::PolicyEventObserver(PolicyHandler* const policy_handler)
+  : policy_handler_(policy_handler) {
+}
+
+void PolicyEventObserver::set_policy_handler(policy::PolicyHandler* const policy_handler) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(policy_handler_lock_);
+  LOG4CXX_DEBUG(logger_, "Set policy handler " << policy_handler);
+  policy_handler_ = policy_handler;
 }
 
 void PolicyEventObserver::on_event(const event_engine::Event& event) {
-  if (!policy_manager_) {
+  sync_primitives::AutoLock auto_lock(policy_handler_lock_);
+  if (!policy_handler_) {
     return;
   }
   const smart_objects::SmartObject& message = event.smart_object();
@@ -67,7 +78,7 @@ void PolicyEventObserver::on_event(const event_engine::Event& event) {
       break;
     }
     case hmi_apis::FunctionID::BasicCommunication_OnReady: {
-      policy_manager_->OnSystemReady();
+      policy_handler_->OnSystemReady();
       unsubscribe_from_event(hmi_apis::FunctionID::BasicCommunication_OnReady);
       break;
     }
@@ -88,8 +99,8 @@ void PolicyEventObserver::ProcessOdometerEvent(const smart_objects::SmartObject&
       const int kSecondsInDay = 60 * 60 * 24;
       int days_after_epoch = current_time.tv_sec / kSecondsInDay;
 
-      if(policy_manager_) {
-        policy_manager_->PTUpdatedAt(
+      if (policy_handler_) {
+        policy_handler_->PTUpdatedAt(
               message[strings::msg_params][strings::odometer].asInt(),
             days_after_epoch);
       }
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index 0033743e75..285fda961a 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2013, Ford Motor Company
+ Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -35,9 +35,11 @@
 #include <algorithm>
 #include <vector>
 #include "application_manager/smart_object_keys.h"
+
 #include "application_manager/policies/policy_handler.h"
-#include "application_manager/policies/pt_exchange_handler_impl.h"
-#include "application_manager/policies/pt_exchange_handler_ext.h"
+
+#include "application_manager/policies/delegates/app_permission_delegate.h"
+
 #include "application_manager/application_manager_impl.h"
 #include "application_manager/message_helper.h"
 #include "policy/policy_manager_impl.h"
@@ -55,6 +57,7 @@
 namespace policy {
 
 #define POLICY_LIB_CHECK(return_value) {\
+  sync_primitives::AutoReadLock lock(policy_manager_lock_); \
   if (!policy_manager_) {\
     LOG4CXX_WARN(logger_, "The shared library of policy is not loaded");\
     return return_value;\
@@ -62,6 +65,7 @@ namespace policy {
 }
 
 #define POLICY_LIB_CHECK_VOID() {\
+  sync_primitives::AutoReadLock lock(policy_manager_lock_); \
   if (!policy_manager_) {\
     LOG4CXX_WARN(logger_, "The shared library of policy is not loaded");\
     return;\
@@ -82,6 +86,7 @@ struct DeactivateApplication {
         app->set_hmi_level(mobile_apis::HMILevel::HMI_NONE);
         application_manager::MessageHelper::SendActivateAppToHMI(
           app->app_id(), hmi_apis::Common_HMILevel::NONE);
+        application_manager::MessageHelper::SendHMIStatusNotification(*app.get());
       }
     }
 
@@ -90,9 +95,8 @@ struct DeactivateApplication {
 };
 
 struct SDLAlowedNotification {
-  explicit SDLAlowedNotification(
-    const connection_handler::DeviceHandle& device_id,
-        utils::SharedPtr<PolicyManager> policy_manager)
+  SDLAlowedNotification(const connection_handler::DeviceHandle& device_id,
+                        PolicyManager* policy_manager)
     : device_id_(device_id),
       policy_manager_(policy_manager){}
 
@@ -121,7 +125,7 @@ struct SDLAlowedNotification {
           return ;
         }
         if (app->hmi_level() == default_mobile_hmi) {
-          LOG4CXX_INFO(logger_, "Application already in default hmi state.");
+          LOG4CXX_DEBUG(logger_, "Application already in default hmi state.");
         } else {
           app->set_hmi_level(default_mobile_hmi);
           application_manager::MessageHelper::SendHMIStatusNotification(*app);
@@ -131,7 +135,7 @@ struct SDLAlowedNotification {
     }
   private:
     connection_handler::DeviceHandle device_id_;
-    utils::SharedPtr<PolicyManager> policy_manager_;
+    PolicyManager* policy_manager_;
 };
 
 struct LinkAppToDevice {
@@ -208,13 +212,11 @@ const std::string PolicyHandler::kLibrary = "libPolicy.so";
 
 PolicyHandler::PolicyHandler()
 
-  : dl_handle_(0),
-// EXTENDED_POLICY
-    exchange_handler_(new PTExchangeHandlerImpl(this)),
-    on_ignition_check_done_(false),
+  : AsyncRunner("PolicyHandler async runner thread"),
+    dl_handle_(0),
     last_activated_app_id_(0),
-    registration_in_progress(false),
-    is_user_requested_policy_table_update_(false),
+    listener_(NULL),
+    app_to_device_link_lock_(true),
     statistic_manager_impl_(new StatisticManagerImpl()) {
 }
 
@@ -223,6 +225,8 @@ PolicyHandler::~PolicyHandler() {
 }
 
 bool PolicyHandler::LoadPolicyLibrary() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoWriteLock lock(policy_manager_lock_);
   if (!PolicyEnabled()) {
     LOG4CXX_WARN(logger_, "System is configured to work without policy "
                  "functionality.");
@@ -235,7 +239,7 @@ bool PolicyHandler::LoadPolicyLibrary() {
   if (error_string == NULL) {
     if (CreateManager()) {
       policy_manager_->set_listener(this);
-      event_observer_= new PolicyEventObserver(policy_manager_);
+      event_observer_= new PolicyEventObserver(this);
     }
   } else {
     LOG4CXX_ERROR(logger_, error_string);
@@ -257,22 +261,22 @@ bool PolicyHandler::CreateManager() {
   } else {
     LOG4CXX_WARN(logger_, error_string);
   }
-  return policy_manager_;
+  return policy_manager_.valid();
 }
 
 bool PolicyHandler::InitPolicyTable() {
-  LOG4CXX_TRACE(logger_, "Init policy table from preloaded.");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK(false);
   // Subscribing to notification for system readiness to be able to get system
   // info necessary for policy table
-  event_observer_.get()->subscribe_on_event(
+  event_observer_->subscribe_on_event(
         hmi_apis::FunctionID::BasicCommunication_OnReady);
   std::string preloaded_file =
     profile::Profile::instance()->preloaded_pt_file();
   if (file_system::FileExists(preloaded_file)) {
     return policy_manager_->InitPT(preloaded_file);
   }
-  LOG4CXX_WARN(logger_, "The file which contains preloaded PT is not exist");
+  LOG4CXX_FATAL(logger_, "The file which contains preloaded PT is not exist");
   return false;
 }
 
@@ -289,7 +293,7 @@ bool PolicyHandler::ResetPolicyTable() {
 }
 
 bool PolicyHandler::ClearUserConsent() {
-  LOG4CXX_INFO(logger_, "Removing user consent records in policy table.");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK(false);
   return policy_manager_->ResetUserConsent();
 }
@@ -359,56 +363,10 @@ uint32_t PolicyHandler::GetAppIdForSending() {
   return selected_app_id;
 }
 
-DeviceConsent PolicyHandler::GetDeviceForSending(DeviceParams& device_params) {
-  POLICY_LIB_CHECK(kDeviceDisallowed);
-  uint32_t app_id = 0;
-  uint32_t app_id_previous = 0;
-  while (true) {
-    app_id = GetAppIdForSending();
-    if (!app_id) {
-      LOG4CXX_WARN(logger_,
-                   "There is no appropriate application for sending PTS.");
-      return kDeviceDisallowed;
-    }
-
-    // If only one application is available, return its device params
-    if (app_id == app_id_previous) {
-      return kDeviceDisallowed;
-    }
-
-    app_id_previous = app_id;
-    application_manager::MessageHelper::GetDeviceInfoForApp(app_id,
-        &device_params);
-
-    DeviceConsent consent = policy_manager_->GetUserConsentForDevice(
-                              device_params.device_mac_address);
-    switch (consent) {
-      case kDeviceAllowed:
-        return consent;
-      case kDeviceDisallowed:
-        continue;
-      case kDeviceHasNoConsent:
-        return consent;
-      default:
-        LOG4CXX_WARN(logger_, "Consent result is not impelemented.");
-        return consent;
-    }
-  }
-  return kDeviceDisallowed;
-}
-
-const std::string PolicyHandler::ConvertUpdateStatus(PolicyTableStatus status) {
-  switch (status) {
-    case policy::StatusUpdatePending:
-      return "UPDATING";
-    case policy::StatusUpdateRequired:
-      return "UPDATE_NEEDED";
-    case policy::StatusUpToDate:
-      return "UP_TO_DATE";
-    default: {
-      return "UNKNOWN";
-    }
-  }
+void PolicyHandler::OnAppPermissionConsent(const uint32_t connection_key,
+                                           const PermissionConsent& permissions) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  AsyncRun(new AppPermissionDelegate(connection_key, permissions));
 }
 
 void PolicyHandler::OnDeviceConsentChanged(const std::string& device_id,
@@ -448,23 +406,38 @@ void PolicyHandler::OnDeviceConsentChanged(const std::string& device_id,
   }
 }
 
+void PolicyHandler::OnPTExchangeNeeded() {
+  POLICY_LIB_CHECK_VOID();
+  policy_manager_->ForcePTExchange();
+}
+
+void PolicyHandler::GetAvailableApps(std::queue<std::string>& apps) {
+  LOG4CXX_INFO(logger_, "GetAvailable apps");
+  application_manager::ApplicationManagerImpl::ApplicationListAccessor accessor;
+  const ApplicationList app_list = accessor.applications();
+  ApplicationList::const_iterator iter = app_list.begin();
+
+  for (;app_list.end() != iter; ++iter) {
+    LOG4CXX_INFO(logger_, "one more app");
+    apps.push((*iter)->mobile_app_id()->asString());
+  }
+}
+
 void PolicyHandler::AddApplication(const std::string& application_id) {
-  // TODO (AGaliuzov): remove this workaround during refactoring.
-  registration_in_progress = true;
   POLICY_LIB_CHECK_VOID();
   policy_manager_->AddApplication(application_id);
 }
 
 void PolicyHandler::SetDeviceInfo(std::string& device_id,
                                   const DeviceInfo& device_info) {
-  LOG4CXX_INFO(logger_, "SetDeviceInfo");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   policy_manager_->SetDeviceInfo(device_id, device_info);
 }
 
-void PolicyHandler::OnAppPermissionConsent(const uint32_t connection_key,
-  PermissionConsent &permissions) {
-  LOG4CXX_INFO(logger_, "OnAppPermissionConsent");
+void PolicyHandler::OnAppPermissionConsentInternal(
+    const uint32_t connection_key, PermissionConsent &permissions) {
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   if (connection_key) {
     application_manager::ApplicationSharedPtr app =
@@ -488,6 +461,7 @@ void PolicyHandler::OnAppPermissionConsent(const uint32_t connection_key,
     return;
   }
 
+  sync_primitives::AutoLock lock(app_to_device_link_lock_);
   if (!app_to_device_link_.size()) {
     LOG4CXX_WARN(logger_, "There are no applications previously stored for "
                  "setting common permissions.");
@@ -531,7 +505,7 @@ void PolicyHandler::OnAppPermissionConsent(const uint32_t connection_key,
 void PolicyHandler::OnGetUserFriendlyMessage(
   const std::vector<std::string>& message_codes, const std::string& language,
   uint32_t correlation_id) {
-  LOG4CXX_INFO(logger_, "OnGetUserFriendlyMessage");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   std::vector<UserFriendlyMessage> result = policy_manager_
       ->GetUserFriendlyMessages(message_codes, language);
@@ -542,11 +516,12 @@ void PolicyHandler::OnGetUserFriendlyMessage(
 
 void PolicyHandler::OnGetListOfPermissions(const uint32_t connection_key,
     const uint32_t correlation_id) {
-  LOG4CXX_INFO(logger_, "OnGetListOfPermissions");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   // If no specific app was passed, get permissions for all currently registered
   // applications
   if (!connection_key) {
+    sync_primitives::AutoLock lock(app_to_device_link_lock_);
     LinkAppToDevice linker(app_to_device_link_);
     application_manager::ApplicationManagerImpl::ApplicationListAccessor accessor;
     const ApplicationList app_list = accessor.applications();
@@ -604,22 +579,20 @@ void PolicyHandler::OnGetListOfPermissions(const uint32_t connection_key,
 }
 
 void PolicyHandler::OnGetStatusUpdate(const uint32_t correlation_id) {
-  LOG4CXX_INFO(logger_, "OnGetStatusUpdate");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
-  policy::PolicyTableStatus status = policy_manager_->GetPolicyTableStatus();
   application_manager::MessageHelper::SendGetStatusUpdateResponse(
-    ConvertUpdateStatus(status), correlation_id);
+    policy_manager_->GetPolicyTableStatus(), correlation_id);
 }
 
-void PolicyHandler::OnUpdateStatusChanged(PolicyTableStatus status) {
-  LOG4CXX_INFO(logger_, "OnUpdateStatusChanged");
-  application_manager::MessageHelper::SendOnStatusUpdate(
-    ConvertUpdateStatus(status));
+void PolicyHandler::OnUpdateStatusChanged(const std::string& status) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  application_manager::MessageHelper::SendOnStatusUpdate(status);
 }
 
 std::string PolicyHandler::OnCurrentDeviceIdUpdateRequired(
   const std::string& policy_app_id) {
-  LOG4CXX_INFO(logger_, "OnCurrentDeviceIdUpdateRequired");
+  LOG4CXX_AUTO_TRACE(logger_);
   application_manager::ApplicationSharedPtr app =
     application_manager::ApplicationManagerImpl::instance()
     ->application_by_policy_id(policy_app_id);
@@ -636,7 +609,7 @@ std::string PolicyHandler::OnCurrentDeviceIdUpdateRequired(
 }
 
 void PolicyHandler::OnSystemInfoChanged(const std::string& language) {
-  LOG4CXX_INFO(logger_, "OnSystemInfoChanged");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   policy_manager_->SetSystemLanguage(language);
 }
@@ -644,13 +617,13 @@ void PolicyHandler::OnSystemInfoChanged(const std::string& language) {
 void PolicyHandler::OnGetSystemInfo(const std::string& ccpu_version,
                                     const std::string& wers_country_code,
                                     const std::string& language) {
-  LOG4CXX_INFO(logger_, "OnGetSystemInfo");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   policy_manager_->SetSystemInfo(ccpu_version, wers_country_code, language);
 }
 
 void PolicyHandler::OnSystemInfoUpdateRequired() {
-  LOG4CXX_INFO(logger_, "OnSystemInfoUpdateRequired");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   application_manager::MessageHelper::SendGetSystemInfoRequest();
 }
@@ -699,7 +672,7 @@ void PolicyHandler::OnAppRevoked(const std::string& policy_app_id) {
 
 void PolicyHandler::OnPendingPermissionChange(
     const std::string& policy_app_id) {
-  LOG4CXX_INFO(logger_, "PolicyHandler::OnPendingPermissionChange for "
+  LOG4CXX_DEBUG(logger_, "PolicyHandler::OnPendingPermissionChange for "
                << policy_app_id);
   POLICY_LIB_CHECK_VOID();
   application_manager::ApplicationSharedPtr app =
@@ -728,15 +701,15 @@ void PolicyHandler::OnPendingPermissionChange(
           SendOnAppPermissionsChangedNotification(app->app_id(), permissions);
 
       policy_manager_->RemovePendingPermissionChanges(policy_app_id);
+      break;
     }
-    break;
   }
   case mobile_apis::HMILevel::HMI_BACKGROUND: {
     if (permissions.isAppPermissionsRevoked) {
       application_manager::MessageHelper::
           SendOnAppPermissionsChangedNotification(app->app_id(), permissions);
 
-      policy_manager_->RemovePendingPermissionChanges(policy_app_id);      
+      policy_manager_->RemovePendingPermissionChanges(policy_app_id);
     }
     break;
   }
@@ -763,11 +736,15 @@ void PolicyHandler::OnPendingPermissionChange(
   }
 }
 
-bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string) {
-  LOG4CXX_INFO(logger_, "PolicyHandler::SendMessageToSDK");
+bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string,
+                                     const std::string& url) {
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK(false);
 
-  std::string url;
+  if (last_used_app_ids_.empty()) {
+    LOG4CXX_WARN(logger_, "last_used_app_ids_ is empty");
+    return false;
+  }
   uint32_t app_id = last_used_app_ids_.back();
 
   application_manager::ApplicationSharedPtr app =
@@ -786,15 +763,13 @@ bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string) {
                  " has no application id.");
     return false;
   }
-  url = policy_manager_->GetUpdateUrl(PolicyServiceTypes::POLICY);
 
-  LOG4CXX_INFO(logger_, "Update url is " << url << " for application "
+  LOG4CXX_DEBUG(logger_, "Update url is " << url << " for application "
                << application_manager::ApplicationManagerImpl::instance()
                ->application(app_id)->name());
 
-  application_manager::MessageHelper::SendPolicySnapshotNotification(app_id,
-      pt_string,
-      url, 0);
+  application_manager::MessageHelper::SendPolicySnapshotNotification(
+        app_id, pt_string, url, 0);
 
   return true;
 }
@@ -803,24 +778,16 @@ bool PolicyHandler::ReceiveMessageFromSDK(const std::string& file,
     const BinaryMessage& pt_string) {
   POLICY_LIB_CHECK(false);
 
-  if (policy_manager_->GetPolicyTableStatus() !=
-      PolicyTableStatus::StatusUpdatePending) {
-    LOG4CXX_WARN(logger_, "PTU processing skipped, since current status is "
-                          "different from pending.");
-    return false;
-  }
-
   bool ret = policy_manager_->LoadPT(file, pt_string);
   LOG4CXX_INFO(logger_, "Policy table is saved: " << std::boolalpha << ret);
   if (ret) {
     LOG4CXX_INFO(logger_, "PTU was successful.");
-    exchange_handler_->Stop();
     policy_manager_->CleanupUnpairedDevices();
     int32_t correlation_id =
       application_manager::ApplicationManagerImpl::instance()
       ->GetNextHMICorrelationID();
 
-    event_observer_.get()->subscribe_on_event(
+    event_observer_->subscribe_on_event(
 #ifdef HMI_DBUS_API
       hmi_apis::FunctionID::VehicleInfo_GetOdometer, correlation_id
 #else
@@ -839,54 +806,25 @@ bool PolicyHandler::ReceiveMessageFromSDK(const std::string& file,
 }
 
 bool PolicyHandler::UnloadPolicyLibrary() {
-  LOG4CXX_TRACE(logger_, "enter. policy_manager_ = " << policy_manager_);
+  LOG4CXX_AUTO_TRACE(logger_);
+  LOG4CXX_DEBUG(logger_, "policy_manager_ = " << policy_manager_);
   bool ret = true;
+  AsyncRunner::Stop();
+  sync_primitives::AutoWriteLock lock(policy_manager_lock_);
   if (policy_manager_) {
-    policy_manager_.release();
+    policy_manager_.reset();
   }
   if (dl_handle_) {
     ret = (dlclose(dl_handle_) == 0);
     dl_handle_ = 0;
   }
-  exchange_handler_->Stop();
   LOG4CXX_TRACE(logger_, "exit");
   return ret;
 }
 
-void PolicyHandler::StartPTExchange(bool skip_device_selection) {
-  LOG4CXX_INFO(logger_, "PolicyHandler::StartPTExchange");
-  POLICY_LIB_CHECK_VOID();
-
-  if (policy_manager_->GetPolicyTableStatus() ==
-      PolicyTableStatus::StatusUpdatePending) {
-    LOG4CXX_INFO(logger_, "Starting exchange skipped, since another exchange "
-                 "is in progress.");
-    return;
-  }
-
-  if (!skip_device_selection) {
-    DeviceParams device_params;
-    DeviceConsent consent = GetDeviceForSending(device_params);
-    switch (consent) {
-      case kDeviceHasNoConsent:
-        // Send OnSDLConsentNeeded to HMI for user consent on device usage
-        pending_device_handles_.push_back(device_params.device_handle);
-        application_manager::MessageHelper::SendOnSDLConsentNeeded(
-          device_params);
-        return;
-      case kDeviceDisallowed:
-        return;
-      default:
-        break;
-    }
-  }
-
-  exchange_handler_->Start();
-}
-
 void PolicyHandler::OnAllowSDLFunctionalityNotification(bool is_allowed,
     uint32_t device_id) {
-  LOG4CXX_INFO(logger_, "OnAllowSDLFunctionalityNotification");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   // Device ids, need to be changed
   std::set<uint32_t> device_ids;
@@ -944,26 +882,17 @@ void PolicyHandler::OnAllowSDLFunctionalityNotification(bool is_allowed,
     pending_device_handles_.erase(it);
   }
 
-// EXTENDED_POLICY
-  // Skip device selection, since user already consented device usage
-  StartPTExchange(true);
 }
 
 void PolicyHandler::OnIgnitionCycleOver() {
-  LOG4CXX_INFO(logger_, "OnIgnitionCycleOver");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   policy_manager_->IncrementIgnitionCycles();
 }
 
-void PolicyHandler::KmsChanged(int kms) {
-  LOG4CXX_INFO(logger_, "PolicyHandler::KmsChanged " << kms << " kilometers");
-  POLICY_LIB_CHECK_VOID();
-  PTExchangeAtOdometer(kms);
-}
-
 void PolicyHandler::OnActivateApp(uint32_t connection_key,
                                   uint32_t correlation_id) {
-  LOG4CXX_INFO(logger_, "OnActivateApp");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   application_manager::ApplicationSharedPtr app =
     application_manager::ApplicationManagerImpl::instance()->application(
@@ -976,6 +905,7 @@ void PolicyHandler::OnActivateApp(uint32_t connection_key,
 
   AppPermissions permissions(policy_app_id);
 
+  sync_primitives::AutoReadLock lock(policy_manager_lock_);
   if (!policy_manager_) {
     LOG4CXX_WARN(logger_, "The shared library of policy is not loaded");
     if (!PolicyEnabled()) {
@@ -990,84 +920,36 @@ void PolicyHandler::OnActivateApp(uint32_t connection_key,
                     policy_app_id);
 
     permissions.isSDLAllowed = true;
-
-    if (permissions.isSDLAllowed &&
-        PolicyTableStatus::StatusUpdateRequired ==
-        policy_manager_->GetPolicyTableStatus()) {
-      StartPTExchange();
-    }
     policy_manager_->RemovePendingPermissionChanges(policy_app_id);
   }
-
-  bool is_app_activated = false;
   // If application is revoked it should not be activated
   // In this case we need to activate application
   if (false == permissions.appRevoked && true == permissions.isSDLAllowed) {
-    is_app_activated =
-        application_manager::ApplicationManagerImpl::instance()->
-        ActivateApplication(app);
+        LOG4CXX_INFO(logger_, "Application will be activated");
+        if (application_manager::ApplicationManagerImpl::instance()->ActivateApplication(app)) {
+          application_manager::MessageHelper::SendHMIStatusNotification(*(app.get()));
+        }
+  } else {
+    LOG4CXX_INFO(logger_, "Application should not be activated");
   }
 
   last_activated_app_id_ = connection_key;
   application_manager::MessageHelper::SendSDLActivateAppResponse(permissions,
                                                               correlation_id);
-  if (is_app_activated) {
-    application_manager::MessageHelper::SendHMIStatusNotification(*app.get());
-  }
-}
-
-void PolicyHandler::PTExchangeAtRegistration(const std::string& app_id) {
-  LOG4CXX_INFO(logger_, "PTExchangeAtIgnition");
-  POLICY_LIB_CHECK_VOID();
-
-  if (policy_manager_->IsAppInUpdateList(app_id)) {
-    StartPTExchange();
-  } else if (false == on_ignition_check_done_) { // TODO(AG): add cond. var to handle this case.
-    TimevalStruct current_time = date_time::DateTime::getCurrentTime();
-    const int kSecondsInDay = 60 * 60 * 24;
-    int days = current_time.tv_sec / kSecondsInDay;
-
-    LOG4CXX_INFO(
-      logger_,
-      "\nIgnition cycles exceeded: " << std::boolalpha <<
-      policy_manager_->ExceededIgnitionCycles()
-      << "\nDays exceeded: " << std::boolalpha
-      << policy_manager_->ExceededDays(days)
-      << "\nStatusUpdateRequired: " << std::boolalpha
-      << (policy_manager_->GetPolicyTableStatus() == StatusUpdateRequired));
-    if (policy_manager_->ExceededIgnitionCycles()
-        || policy_manager_->ExceededDays(days)
-        || policy_manager_->GetPolicyTableStatus() == StatusUpdateRequired) {
-      StartPTExchange();
-    }
-  }
-  on_ignition_check_done_ = true;
 }
 
-void PolicyHandler::PTExchangeAtOdometer(int kilometers) {
+void PolicyHandler::KmsChanged(int kilometers) {
+  LOG4CXX_DEBUG(logger_, "PolicyHandler::KmsChanged " << kilometers << " kilometers");
   POLICY_LIB_CHECK_VOID();
-  if (policy_manager_->ExceededKilometers(kilometers)) {
-    LOG4CXX_INFO(logger_, "Enough kilometers passed to send for PT update.");
-    StartPTExchange();
-  }
+  policy_manager_->KmsChanged(kilometers);
 }
 
 void PolicyHandler::PTExchangeAtUserRequest(uint32_t correlation_id) {
   LOG4CXX_TRACE(logger_, "PT exchange at user request");
   POLICY_LIB_CHECK_VOID();
-  policy::PolicyTableStatus status = policy_manager_->GetPolicyTableStatus();
-  if (status != policy::StatusUpdatePending) {
-    OnPTExchangeNeeded();
-    status = policy::StatusUpdatePending;
-  } else {
-    is_user_requested_policy_table_update_ = true;
-  }
-  application_manager::MessageHelper::SendUpdateSDLResponse(
-    ConvertUpdateStatus(status), correlation_id);
-}
-
-void PolicyHandler::OnPTExchangeNeeded() {
-  StartPTExchange();
+  std::string update_status = policy_manager_->ForcePTExchange();
+  application_manager::MessageHelper::SendUpdateSDLResponse(update_status,
+                                                            correlation_id);
 }
 
 void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
@@ -1076,7 +958,7 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
   application_manager::ApplicationSharedPtr app =
     application_manager::ApplicationManagerImpl::instance()
     ->application_by_policy_id(policy_app_id);
-
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!app.valid()) {
     LOG4CXX_WARN(
       logger_,
@@ -1087,7 +969,7 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
   application_manager::MessageHelper::SendOnPermissionsChangeNotification(
     app->app_id(), permissions);
 
-  LOG4CXX_INFO(
+  LOG4CXX_DEBUG(
     logger_,
     "Notification sent for application_id:" << policy_app_id
     << " and connection_key " << app->app_id());
@@ -1104,7 +986,7 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
     return;
   }
   if (current_hmi_level == hmi_level) {
-    LOG4CXX_INFO(logger_, "Application already in default hmi state.");
+    LOG4CXX_DEBUG(logger_, "Application already in default hmi state.");
     return;
   }
   switch (current_hmi_level) {
@@ -1116,16 +998,14 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
       // sent on response receiving.
       if (mobile_apis::HMILevel::HMI_FULL == hmi_level) {
         application_manager::MessageHelper::SendActivateAppToHMI(app->app_id());
-        break;
-      }
-
-      // Set application hmi level
-      app->set_hmi_level(hmi_level);
-
-      // Send notification to mobile
-      application_manager::MessageHelper::SendHMIStatusNotification(*app.get());
+      } else {
+        // Set application hmi level
+        app->set_hmi_level(hmi_level);
+        // If hmi Level is full, it will be seted after ActivateApp response
+        application_manager::MessageHelper::SendHMIStatusNotification(*app.get());
       }
       break;
+    }
     default:
       LOG4CXX_WARN(logger_, "Application " << policy_app_id << " is running."
                    "HMI level won't be changed.");
@@ -1133,6 +1013,33 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
   }
 }
 
+bool PolicyHandler::SaveSnapshot(const BinaryMessage& pt_string,
+                                 std::string& snap_path) {
+  using namespace profile;
+
+  const std::string& policy_snapshot_file_name = Profile::instance()->policies_snapshot_file_name();
+  const std::string& system_files_path = Profile::instance()->system_files_path();
+  snap_path = system_files_path + '/' + policy_snapshot_file_name;
+
+  bool result = false;
+  if (file_system::CreateDirectoryRecursively(system_files_path)) {
+    result = file_system::WriteBinaryFile(snap_path, pt_string);
+  }
+
+  if (!result) {
+    LOG4CXX_ERROR(logger_, "Failed to write snapshot file to " << snap_path);
+  }
+
+  return result;
+}
+
+void PolicyHandler::OnSnapshotCreated(const BinaryMessage& pt_string,
+                                      const std::vector<int>& retry_delay_seconds,
+                                      int timeout_exchange) {
+  using namespace application_manager;
+  SendMessageToSDK(pt_string, policy_manager_->GetUpdateUrl(POLICY));
+}
+
 bool PolicyHandler::GetPriority(const std::string& policy_app_id,
                                 std::string* priority) {
   POLICY_LIB_CHECK(false);
@@ -1172,9 +1079,9 @@ bool PolicyHandler::GetInitialAppData(const std::string& application_id,
   return policy_manager_->GetInitialAppData(application_id, nicknames, app_hmi_types);
 }
 
-EndpointUrls PolicyHandler::GetUpdateUrls(int service_type) {
-  POLICY_LIB_CHECK(EndpointUrls());
-  return policy_manager_->GetUpdateUrls(service_type);
+void PolicyHandler::GetUpdateUrls(int service_type, EndpointUrls& end_points) {
+  POLICY_LIB_CHECK_VOID();
+  policy_manager_->GetUpdateUrls(service_type, end_points);
 }
 
 void PolicyHandler::ResetRetrySequence() {
@@ -1197,14 +1104,18 @@ void PolicyHandler::OnExceededTimeout() {
   policy_manager_->OnExceededTimeout();
 }
 
-BinaryMessageSptr PolicyHandler::RequestPTUpdate() {
-  POLICY_LIB_CHECK(BinaryMessageSptr());
-  return policy_manager_->RequestPTUpdate();
+void PolicyHandler::OnSystemReady() {
+  POLICY_LIB_CHECK_VOID();
+  policy_manager_->OnSystemReady();
+}
+
+void PolicyHandler::PTUpdatedAt(int kilometers, int days_after_epoch) {
+  POLICY_LIB_CHECK_VOID();
+  policy_manager_->PTUpdatedAt(kilometers, days_after_epoch);
 }
 
-const std::vector<int> PolicyHandler::RetrySequenceDelaysSeconds() {
-  POLICY_LIB_CHECK(std::vector<int>());
-  return policy_manager_->RetrySequenceDelaysSeconds();
+void PolicyHandler::set_listener(PolicyHandlerObserver* listener) {
+  listener_ = listener;
 }
 
 utils::SharedPtr<usage_statistics::StatisticsManager>
@@ -1262,22 +1173,15 @@ std::string PolicyHandler::GetAppName(const std::string& policy_app_id) {
   return  app->name();
 }
 
-void PolicyHandler::OnUserRequestedUpdateCheckRequired() {
-  LOG4CXX_INFO(logger_, "OnUserRequestedUpdateCheckRequired");
-  POLICY_LIB_CHECK_VOID();
-  policy::PolicyTableStatus status = policy_manager_->GetPolicyTableStatus();
-  if (is_user_requested_policy_table_update_ &&
-      status != policy::StatusUpdatePending) {
-    is_user_requested_policy_table_update_ = false;
-    OnPTExchangeNeeded();
-    return;
+void PolicyHandler::OnUpdateHMIAppType(std::map<std::string, StringArray> app_hmi_types) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (listener_) {
+    listener_->OnUpdateHMIAppType(app_hmi_types);
   }
-  LOG4CXX_WARN(logger_, "There is another pending update is present."
-               "User-requested update is postponed.");
 }
 
 void PolicyHandler::RemoveDevice(const std::string& device_id) {
-  LOG4CXX_INFO(logger_, "PolicyHandler::RemoveDevice");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
 
   policy_manager_->MarkUnpairedDevice(device_id);
@@ -1292,7 +1196,7 @@ bool PolicyHandler::IsApplicationRevoked(const std::string& app_id) {
 }
 
 void PolicyHandler::OnUpdateRequestSentToMobile() {
-  LOG4CXX_INFO(logger_, "OnUpdateRequestSentToMobile");
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   policy_manager_->OnUpdateStarted();
 }
diff --git a/src/components/application_manager/src/request_controller.cc b/src/components/application_manager/src/request_controller.cc
index 5faabde458..37499b326c 100644
--- a/src/components/application_manager/src/request_controller.cc
+++ b/src/components/application_manager/src/request_controller.cc
@@ -49,70 +49,61 @@ RequestController::RequestController()
   : pool_state_(UNDEFINED),
     pool_size_(profile::Profile::instance()->thread_pool_size()),
     pending_request_set_lock_(true),
-    timer_("RequestCtrlTimer", this, &RequestController::onTimer, true)
-{
-  LOG4CXX_INFO(logger_, "RequestController::RequestController()");
+    timer_("RequestCtrlTimer", this, &RequestController::onTimer, true),
+    is_low_voltage_(false) {
+  LOG4CXX_AUTO_TRACE(logger_);
   InitializeThreadpool();
   timer_.start(dafault_sleep_time_);
-  LOG4CXX_DEBUG(logger_," Create timer thread ; timer thread = " << timer_.thread_->thread_handle());
 }
 
 RequestController::~RequestController() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   if (pool_state_ != TPoolState::STOPPED) {
     DestroyThreadpool();
   }
-
-  pool_.clear();
-  mobile_request_list_.clear();
-  pending_request_set_.clear();
 }
 
-void RequestController::InitializeThreadpool()
-{
-  LOG4CXX_TRACE_ENTER(logger_);
+void RequestController::InitializeThreadpool() {
+  LOG4CXX_AUTO_TRACE(logger_);
   // TODO: Consider lazy loading threads instead of creating all at once
   pool_state_ = TPoolState::STARTED;
+  char name[50];
   for (uint32_t i = 0; i < pool_size_; i++) {
-    char name [50];
-    snprintf(name, sizeof(name)/sizeof(name[0]),
-             "AM Pool %d", i);
+    snprintf(name, sizeof(name)/sizeof(name[0]), "AM Pool %d", i);
     pool_.push_back(threads::CreateThread(name, new Worker(this)));
     pool_[i]->start();
-    LOG4CXX_INFO(logger_, "Request thread initialized: " << name);
+    LOG4CXX_DEBUG(logger_, "Request thread initialized: " << name);
   }
 }
 
 void RequestController::DestroyThreadpool() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   {
-    sync_primitives::AutoLock auto_lock (mobile_request_list_lock_);
+    sync_primitives::AutoLock auto_lock(mobile_request_list_lock_);
     pool_state_ = TPoolState::STOPPED;
-    LOG4CXX_INFO(logger_, "Broadcasting STOP signal to all threads...");
-    cond_var_.Broadcast(); // notify all threads we are shutting down
+    LOG4CXX_DEBUG(logger_, "Broadcasting STOP signal to all threads...");
+    cond_var_.Broadcast();  // notify all threads we are shutting down
   }
-  for (uint32_t i = 0; i < pool_size_; i++) {
-    pool_[i]->stop();
-    threads::DeleteThread(pool_[i]);
+  for (size_t i = 0; i < pool_.size(); i++) {
+    Thread* thread = pool_[i];
+    thread->join();
+    delete thread->delegate();
+    threads::DeleteThread(thread);
   }
-  LOG4CXX_INFO(logger_, "Threads exited from the thread pool " << pool_size_);
+  pool_.clear();
 }
 
 RequestController::TResult RequestController::addMobileRequest(
-    const MobileRequestPtr& request,
+    const RequestPtr request,
     const mobile_apis::HMILevel::eType& hmi_level) {
-  LOG4CXX_TRACE_ENTER(logger_);
   if (!request.valid()) {
-    LOG4CXX_INFO(logger_, "Null Pointer request");
-    LOG4CXX_TRACE_EXIT(logger_);
+    LOG4CXX_ERROR(logger_, "Null Pointer request");
     cond_var_.NotifyOne();
     return INVALID_DATA;
   }
 
-  TResult result = SUCCESS;
-  const commands::CommandRequestImpl* request_impl =
-      static_cast<commands::CommandRequestImpl*>(request.get());
-  LOG4CXX_DEBUG(logger_, "addMobileRequest " << request_impl->correlation_id());
+  LOG4CXX_DEBUG(logger_, "ENTER correlation_id : " << request->correlation_id()
+                << "connection_key : " << request->connection_key());
   const uint32_t& app_hmi_level_none_time_scale =
       profile::Profile::instance()->app_hmi_level_none_time_scale();
 
@@ -128,206 +119,239 @@ RequestController::TResult RequestController::addMobileRequest(
   const uint32_t& pending_requests_amount =
       profile::Profile::instance()->pending_requests_amount();
 
-  if (!checkHMILevelTimeScaleMaxRequest(mobile_apis::HMILevel::HMI_NONE,
-                                        request_impl->connection_key(),
+  if (!CheckHMILevelTimeScaleMaxRequest(mobile_apis::HMILevel::HMI_NONE,
+                                        request->connection_key(),
                                         app_hmi_level_none_time_scale,
                                         app_hmi_level_none_max_request_per_time_scale)) {
     LOG4CXX_ERROR(logger_, "Too many application requests in hmi level NONE");
-    result = RequestController::NONE_HMI_LEVEL_MANY_REQUESTS;
-  } else if (!checkTimeScaleMaxRequest(
-        request_impl->connection_key(),
-        app_time_scale, max_request_per_time_scale)) {
+    return RequestController::NONE_HMI_LEVEL_MANY_REQUESTS;
+  }
+  if (!CheckTimeScaleMaxRequest(request->connection_key(),
+                                app_time_scale,
+                                max_request_per_time_scale)) {
     LOG4CXX_ERROR(logger_, "Too many application requests");
-    result = RequestController::TOO_MANY_REQUESTS;
-  } else if (pending_requests_amount == mobile_request_list_.size()) {
+    return RequestController::TOO_MANY_REQUESTS;
+  }
+  if (!CheckPendingRequestsAmount(pending_requests_amount)) {
     LOG4CXX_ERROR(logger_, "Too many pending request");
-    result = RequestController::TOO_MANY_PENDING_REQUESTS;
+    return RequestController::TOO_MANY_PENDING_REQUESTS;
   }
   {
-    AutoLock auto_lock(mobile_request_list_lock_);
-
+    AutoLock auto_lock_list(mobile_request_list_lock_);
+    AutoLock auto_lock_set(pending_request_set_lock_);
     mobile_request_list_.push_back(request);
-    LOG4CXX_INFO(logger_, "mobile_request_list_ size is "
-                 << mobile_request_list_.size()
-                 << " pending_request_set_ size is "
-                 << pending_request_set_.size()
-                 );
-  }
-
+    LOG4CXX_DEBUG(logger_,
+                  "new mobile_request_list_ size is " << mobile_request_list_.size()
+                  << ", pending_request_set_ size is " << pending_request_set_.size());
   // wake up one thread that is waiting for a task to be available
+  }
   cond_var_.NotifyOne();
-  LOG4CXX_TRACE_EXIT(logger_);
-  return result;
+  return SUCCESS;
 }
 
 RequestController::TResult RequestController::addHMIRequest(
     const RequestPtr request) {
-  LOG4CXX_TRACE_ENTER(logger_);
   DCHECK(request.valid());
-  LOG4CXX_DEBUG(logger_, "addHMIRequest " << request->correlation_id());
+  if (!request.valid()) {
+    LOG4CXX_ERROR(logger_, "HMI request pointer is invalid");
+    return RequestController::INVALID_DATA;
+  }
+  LOG4CXX_DEBUG(logger_, "ENTER addHMIRequest : " << request->correlation_id());
 
-  uint32_t timeout_in_seconds = request->default_timeout()/date_time::DateTime::MILLISECONDS_IN_SECOND;
+  const uint32_t timeout_in_seconds =
+      request->default_timeout() / date_time::DateTime::MILLISECONDS_IN_SECOND;
   RequestInfoPtr request_info_ptr =
       new HMIRequestInfo(request,
                          timeout_in_seconds);
 
   if (0 != timeout_in_seconds) {
-    pending_request_set_lock_.Acquire();
+    AutoLock auto_lock(pending_request_set_lock_);
     pending_request_set_.insert(request_info_ptr);
     LOG4CXX_INFO(logger_, "pending_request_set_ size is "
                  << pending_request_set_.size());
     UpdateTimer();
-    pending_request_set_lock_.Release();
   } else {
     LOG4CXX_INFO(logger_, "Default timeout was set to 0."
                  "RequestController will not track timeout of this request.");
   }
-  LOG4CXX_TRACE_EXIT(logger_);
   return RequestController::SUCCESS;
 }
 
 void RequestController::addNotification(const RequestPtr ptr) {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   notification_list_.push_back(ptr);
-  LOG4CXX_TRACE_EXIT(logger_);
 }
 
 void RequestController::removeNotification(const commands::Command* notification) {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   std::list<RequestPtr>::iterator it = notification_list_.begin();
-  for (; notification_list_.end() != it; ++it) {
+  for (; notification_list_.end() != it; ) {
     if (it->get() == notification) {
-      notification_list_.erase(it);
+      notification_list_.erase(it++);
       break;
+    } else {
+      ++it;
     }
   }
-  LOG4CXX_TRACE_EXIT(logger_);
 }
 
 void RequestController::terminateMobileRequest(
-    const uint32_t& mobile_correlation_id) {
-  LOG4CXX_TRACE_ENTER(logger_);
-
+    const uint32_t& mobile_correlation_id,
+    const uint32_t& connection_key) {
   AutoLock auto_lock(pending_request_set_lock_);
+  LOG4CXX_TRACE(logger_, "ENTER corr_id = " << mobile_correlation_id
+                << " connection_key = " << connection_key);
   RequestInfoSet::iterator it = pending_request_set_.begin();
   for (; pending_request_set_.end() != it; ++it) {
-    RequestInfo* mobile_request_info = it->get();
-    if (NULL == mobile_request_info) {
+    RequestInfoPtr request_info = (*it);
+    if ((false == request_info.valid()) ||
+        RequestInfo::MobileRequest != request_info->requst_type()||
+        connection_key != request_info->app_id()) {
       continue;
     }
-    if (mobile_correlation_id == mobile_request_info->requestId()) {
-      mobile_request_info->request()->CleanUp();
+    if (mobile_correlation_id == request_info->requestId()) {
+      request_info->request()->CleanUp();
       pending_request_set_.erase(it);
       LOG4CXX_INFO(logger_, "Mobile request terminated: " << mobile_correlation_id <<
                    " pending_request_set_ size : " << pending_request_set_.size());
       UpdateTimer();
-      LOG4CXX_TRACE_EXIT(logger_);
       return;
     }
   }
   LOG4CXX_INFO(logger_, "Mobile request NOT terminated: " << mobile_correlation_id <<
                         " pending_request_set_ size : " << pending_request_set_.size());
-  LOG4CXX_TRACE_EXIT(logger_);
 }
 
 void RequestController::terminateHMIRequest(const uint32_t &correlation_id) {
-  LOG4CXX_TRACE_ENTER(logger_);
   AutoLock auto_lock(pending_request_set_lock_);
+  LOG4CXX_TRACE(logger_, "ENTER correlation_id = " << correlation_id);
   RequestInfoSet::iterator it = pending_request_set_.begin();
   for (; pending_request_set_.end() != it; ++it) {
-    RequestInfo* hmi_request_info = it->get();
-    if (NULL == hmi_request_info) {
+    RequestInfoPtr request_info = (*it);
+    if ((false == request_info.valid()) ||
+        RequestInfo::HMIRequest != request_info->requst_type() ||
+        (0 != request_info->app_id())) {
       continue;
     }
-    if (correlation_id == hmi_request_info->requestId()) {
-      hmi_request_info->request()->CleanUp();
+    if (correlation_id == request_info->requestId()) {
+      request_info->request()->CleanUp();
       pending_request_set_.erase(it);
       LOG4CXX_DEBUG(logger_, "HMI request terminated: " << correlation_id);
       UpdateTimer();
-      LOG4CXX_TRACE_EXIT(logger_);
       return;
     }
   }
   LOG4CXX_INFO(logger_, "HMI request NOT terminated: " << correlation_id <<
                         " pending_request_set_ size : " << pending_request_set_.size());
-  LOG4CXX_TRACE_EXIT(logger_);
 }
 
 void RequestController::terminateAppRequests(
     const uint32_t& app_id) {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_INFO(logger_, "ENTER terminate all app requests : " << app_id
+                        << " mobile_request_list_ size is : " << mobile_request_list_.size()
+                        << " pending_request_set_ size is : " << pending_request_set_.size());
+
+  AutoLock mobile_requests_auto_lock(mobile_request_list_lock_);
+  std::list<RequestPtr>::iterator request_it = mobile_request_list_.begin();
+  while (mobile_request_list_.end() != request_it) {
+    RequestPtr request = (*request_it);
+    if ((request.valid()) && (request->connection_key() == app_id)) {
+      mobile_request_list_.erase(request_it++);
+    } else {
+      ++request_it;
+    }
+  }
 
   AutoLock auto_lock(pending_request_set_lock_);
   RequestInfoSet::iterator it = pending_request_set_.begin();
   while (pending_request_set_.end() != it) {
-    RequestInfo* mobile_request_info = it->get();
-    if (NULL == mobile_request_info) {
+    RequestInfoPtr request_info = (*it);
+    if ((false == request_info.valid()) ||
+        RequestInfo::MobileRequest != request_info->requst_type()) {
       ++it;
       continue;
     }
 
-    if (mobile_request_info->app_id() == app_id) {
-      mobile_request_info->request()->CleanUp();
+    if (request_info->app_id() == app_id) {
+      request_info->request()->CleanUp();
       pending_request_set_.erase(it++);
-      LOG4CXX_INFO(logger_, "terminated all app requests : " << app_id);
     } else {
       ++it;
     }
   }
+
+  LOG4CXX_INFO(logger_, "EXIT terminate all app requests : " << app_id
+                        << " mobile_request_list_ size is : " << mobile_request_list_.size()
+                        << " pending_request_set_ size is : " << pending_request_set_.size());
+
   UpdateTimer();
-  LOG4CXX_TRACE_EXIT(logger_);
 }
 
 void RequestController::terminateAllHMIRequests() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   AutoLock auto_lock(pending_request_set_lock_);
   RequestInfoSet::iterator it = pending_request_set_.begin();
   while (pending_request_set_.end() != it) {
-    RequestInfo* hmi_request_info = it->get();
-    if (NULL == hmi_request_info) {
+    RequestInfoPtr request_info = (*it);
+    if ((false == request_info.valid()) ||
+        RequestInfo::HMIRequest != request_info->requst_type()) {
       ++it;
       continue;
     }
-    hmi_request_info->request()->CleanUp();
+    request_info->request()->CleanUp();
     pending_request_set_.erase(it++);
     LOG4CXX_INFO(logger_, "HMI request terminated: ");
   }
-  LOG4CXX_TRACE_EXIT(logger_);
+}
+void RequestController::terminateAllMobileRequests() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  AutoLock auto_lock(pending_request_set_lock_);
+  RequestInfoSet::iterator it = pending_request_set_.begin();
+  while (pending_request_set_.end() != it) {
+    RequestInfoPtr request_info = (*it);
+    if ((false == request_info.valid()) ||
+        RequestInfo::MobileRequest != request_info->requst_type()) {
+      ++it;
+      continue;
+    }
+    request_info->request()->CleanUp();
+    LOG4CXX_INFO(logger_, "Mobile request terminated: "
+                 <<  request_info->requestId());
+    pending_request_set_.erase(it++);
+  }
+  UpdateTimer();
 }
 
 void RequestController::updateRequestTimeout(
     const uint32_t& app_id,
     const uint32_t& mobile_correlation_id,
     const uint32_t& new_timeout) {
-
-  LOG4CXX_TRACE_ENTER(logger_);
-
+  LOG4CXX_TRACE(logger_, " ENTER app_id : " << app_id
+                << " mobile_correlation_id : " << mobile_correlation_id
+                << " new_timeout : " << new_timeout);
   AutoLock auto_lock(pending_request_set_lock_);
   RequestInfoSet::iterator it = pending_request_set_.begin();
-  RequestInfo* mobile_request_info = NULL;
   RequestInfoPtr request_info;
   for (; pending_request_set_.end() != it; ++it) {
     request_info = *it;
     if (false == request_info.valid()) {
-      LOG4CXX_ERROR(logger_, "Invalid request, can't update timeout");
+      LOG4CXX_ERROR(logger_, "Invalid request pointer in pending_request_set_");
       continue;
     }
-    mobile_request_info = request_info.get();
-    if (NULL == mobile_request_info) {
+    if (RequestInfo::MobileRequest != request_info->requst_type()) {
       continue;
     }
-    if (app_id == mobile_request_info->app_id() &&
-        mobile_correlation_id == mobile_request_info->requestId()) {
+    if (app_id == request_info->app_id() &&
+        mobile_correlation_id == request_info->requestId()) {
       break;
     }
   }
 
   if (it != pending_request_set_.end()) {
-    DCHECK(mobile_request_info);
     DCHECK(request_info.valid());
 
     uint32_t timeout_in_seconds = new_timeout/date_time::DateTime::MILLISECONDS_IN_SECOND;
-    mobile_request_info->updateTimeOut(timeout_in_seconds);
+    request_info->updateTimeOut(timeout_in_seconds);
     pending_request_set_.erase(it);
     pending_request_set_.insert(request_info);
     // erase and insert need to update ordering of set
@@ -339,33 +363,67 @@ void RequestController::updateRequestTimeout(
   } else {
     LOG4CXX_ERROR(logger_, "Can't find request with "
                   << " app_id " << app_id
-                  << " mobile_correlation_id " << mobile_correlation_id );
+                  << " mobile_correlation_id " << mobile_correlation_id);
   }
 }
 
+void RequestController::OnLowVoltage() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  is_low_voltage_ = true;
+}
+
+void RequestController::OnWakeUp() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  terminateAllHMIRequests();
+  terminateAllMobileRequests();
+  is_low_voltage_ = false;
+  LOG4CXX_DEBUG(logger_, "Terminate old requests done");
+}
+
+bool RequestController::IsLowVoltage() {
+  LOG4CXX_TRACE(logger_, "result: " << is_low_voltage_);
+  return is_low_voltage_;
+}
+
 void RequestController::onTimer() {
-  LOG4CXX_TRACE_ENTER(logger_);
   AutoLock auto_lock(pending_request_set_lock_);
+  LOG4CXX_TRACE(logger_, "ENTER pending_request_set_ size :"
+                << pending_request_set_.size());
   RequestInfoSet::iterator probably_expired = pending_request_set_.begin();
-  while (pending_request_set_.end() != probably_expired) {
+  while (probably_expired != pending_request_set_.end()) {
     RequestInfoPtr request = *probably_expired;
+    if (false == request.valid()) {
+      LOG4CXX_ERROR(logger_, "Invalid pointer in pending_request_set_");
+      pending_request_set_.erase(probably_expired);
+      probably_expired =  pending_request_set_.begin();
+      continue;
+    }
     if (request->timeout_sec() == 0) {
-      LOG4CXX_INFO(logger_, "Ignore " << request->requestId());
+      // FIXME(EZamakhov): inf loop on true
+      LOG4CXX_DEBUG(logger_, "Ignore " << request->requestId());
       ++probably_expired;
       // This request should not be observed for TIME_OUT
       continue;
     }
     if (request->isExpired()) {
-      pending_request_set_.erase(probably_expired);
+      LOG4CXX_INFO(logger_, "Timeout for "
+                   << (RequestInfo::HMIRequest == request->requst_type() ? "HMI": "Mobile")
+                   << " request. id: " << request->requestId()
+                   << " connection_key: " << request->app_id() << " is expired");
+
+      // Mobile Requests will  be erased by TIME_OUT response;
       request->request()->onTimeOut();
-      request->request()->CleanUp();
-      LOG4CXX_INFO(logger_, "Timeout for request id " << request->requestId() << " expired");
-      probably_expired = pending_request_set_.begin();
-      break;
+      if (RequestInfo::HMIRequest == request->requst_type()) {
+        pending_request_set_.erase(probably_expired);
+      }
+      // If request is ersed by response probably_expired iterator is invalid
+      // If request timeout updated, set probably_expired iterator is invalid too.
+      probably_expired =  pending_request_set_.begin();
+    } else {
+      ++probably_expired;
     }
   }
   UpdateTimer();
-  LOG4CXX_TRACE_EXIT(logger_);
 }
 
 RequestController::Worker::Worker(RequestController* requestController)
@@ -377,14 +435,14 @@ RequestController::Worker::~Worker() {
 }
 
 void RequestController::Worker::threadMain() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock auto_lock(thread_lock_);
   while (!stop_flag_) {
     // Try to pick a request
     sync_primitives::AutoLock auto_lock(request_controller_->mobile_request_list_lock_);
 
     while ((request_controller_->pool_state_ != TPoolState::STOPPED) &&
-        (request_controller_->mobile_request_list_.empty())) {
+           (request_controller_->mobile_request_list_.empty())) {
       // Wait until there is a task in the queue
       // Unlock mutex while wait, then lock it back when signaled
       LOG4CXX_INFO(logger_, "Unlocking and waiting");
@@ -397,19 +455,24 @@ void RequestController::Worker::threadMain() {
       break;
     }
 
-    MobileRequestPtr request(request_controller_->mobile_request_list_.front());
+    if (request_controller_->mobile_request_list_.empty()) {
+      LOG4CXX_WARN(logger_, "Mobile request list is empty");
+      break;
+    }
 
+    RequestPtr request(request_controller_->mobile_request_list_.front());
     request_controller_->mobile_request_list_.pop_front();
-    bool init_res = request->Init(); // to setup specific default timeout
+    bool init_res = request->Init();  // to setup specific default timeout
 
-    uint32_t timeout_in_seconds = request->default_timeout()/date_time::DateTime::MILLISECONDS_IN_SECOND;
+    const uint32_t timeout_in_seconds =
+        request->default_timeout() / date_time::DateTime::MILLISECONDS_IN_SECOND;
     RequestInfoPtr request_info_ptr(new MobileRequestInfo(request,
                                                           timeout_in_seconds));
 
     request_controller_->pending_request_set_lock_.Acquire();
     request_controller_->pending_request_set_.insert(request_info_ptr);
     if (0 != timeout_in_seconds) {
-      LOG4CXX_INFO(logger_, "Add Request " << request_info_ptr->requestId() <<
+      LOG4CXX_INFO(logger_, "Execute MobileRequest corr_id = " << request_info_ptr->requestId() <<
                             " with timeout: " << timeout_in_seconds);
       request_controller_->UpdateTimer();
     } else {
@@ -420,94 +483,128 @@ void RequestController::Worker::threadMain() {
     AutoUnlock unlock(auto_lock);
 
     // execute
-    if (request->CheckPermissions() && init_res) {
+    if ((false == request_controller_->IsLowVoltage()) &&
+        request->CheckPermissions() && init_res) {
       request->Run();
     }
   }
-
 }
 
-bool RequestController::Worker::exitThreadMain() {
+void RequestController::Worker::exitThreadMain() {
   stop_flag_ = true;
-  sync_primitives::AutoLock auto_lock(thread_lock_);
   // setup stop flag and whit while threadMain will be finished correctly
-  // FIXME (dchmerev@luxoft.com): There is no wating
-  return true;
+  // FIXME (dchmerev@luxoft.com): There is no waiting
 }
 
-bool RequestController::checkTimeScaleMaxRequest(
+bool RequestController::CheckTimeScaleMaxRequest(
     const uint32_t& app_id,
     const uint32_t& app_time_scale,
     const uint32_t& max_request_per_time_scale) {
-  LOG4CXX_TRACE_ENTER(logger_);
-  {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (max_request_per_time_scale > 0
+      && app_time_scale > 0) {
     AutoLock auto_lock(pending_request_set_lock_);
     TimevalStruct end = date_time::DateTime::getCurrentTime();
-    TimevalStruct start;
+    TimevalStruct start = {0, 0};
     start.tv_sec = end.tv_sec - app_time_scale;
 
     TimeScale scale(start, end, app_id);
-    uint32_t count = 0;
-
-    count = count_if (pending_request_set_.begin(), pending_request_set_.end(), scale);
-    if (count == max_request_per_time_scale ) {
-      LOG4CXX_ERROR(logger_, "Requests count " << count <<
-                    " exceed application limit " << max_request_per_time_scale);
-      return true;
+    const uint32_t count = std::count_if(pending_request_set_.begin(),
+                                         pending_request_set_.end(), scale);
+    if (count >= max_request_per_time_scale) {
+      LOG4CXX_WARN(logger_, "Processing requests count " << count <<
+                   " exceed application limit " << max_request_per_time_scale);
+      return false;
     }
+    LOG4CXX_DEBUG(logger_, "Requests count " << count);
+  } else {
+    LOG4CXX_DEBUG(logger_, "CheckTimeScaleMaxRequest disabled");
   }
   return true;
 }
 
-bool RequestController::checkHMILevelTimeScaleMaxRequest(
+bool RequestController::CheckHMILevelTimeScaleMaxRequest(
     const mobile_apis::HMILevel::eType& hmi_level,
     const uint32_t& app_id,
     const uint32_t& app_time_scale,
     const uint32_t& max_request_per_time_scale) {
-  LOG4CXX_TRACE_ENTER(logger_);
-    {
-      AutoLock auto_lock(pending_request_set_lock_);
-      TimevalStruct end = date_time::DateTime::getCurrentTime();
-      TimevalStruct start;
-      start.tv_sec = end.tv_sec - app_time_scale;
-
-      HMILevelTimeScale scale(start, end, app_id, hmi_level);
-      uint32_t count = 0;
-
-      count = count_if (pending_request_set_.begin(), pending_request_set_.end(), scale);
-      if (count == max_request_per_time_scale ) {
-        LOG4CXX_ERROR(logger_, "Requests count " << count
-                      << " exceed application limit " << max_request_per_time_scale
-                      << " in hmi level " << hmi_level);
-        return false;
-      }
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (max_request_per_time_scale > 0 &&
+      app_time_scale > 0) {
+    AutoLock auto_lock(pending_request_set_lock_);
+    TimevalStruct end = date_time::DateTime::getCurrentTime();
+    TimevalStruct start = {0, 0};
+    start.tv_sec = end.tv_sec - app_time_scale;
+
+    HMILevelTimeScale scale(start, end, app_id, hmi_level);
+    const uint32_t count = std::count_if(pending_request_set_.begin(),
+                                         pending_request_set_.end(), scale);
+    if (count >= max_request_per_time_scale) {
+      LOG4CXX_WARN(logger_, "Processing requests count " << count
+                   << " exceed application limit " << max_request_per_time_scale
+                   << " in hmi level " << hmi_level);
+      return false;
+    }
+    LOG4CXX_DEBUG(logger_, "Requests count " << count);
+  } else {
+    LOG4CXX_DEBUG(logger_, "CheckHMILevelTimeScaleMaxRequest disabled");
+  }
+  return true;
+}
+
+bool RequestController::CheckPendingRequestsAmount(
+    const uint32_t& pending_requests_amount) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (pending_requests_amount > 0) {
+    AutoLock auto_lock(mobile_request_list_lock_);
+    const size_t pending_requests_size = mobile_request_list_.size();
+    const bool available_to_add =
+        pending_requests_amount > pending_requests_size;
+    if(!available_to_add) {
+      LOG4CXX_WARN(logger_, "Pending requests count " << pending_requests_size
+                   << " exceed application limit " << pending_requests_amount);
     }
+    return available_to_add;
+  }
+  LOG4CXX_DEBUG(logger_, "CheckPendingRequestsAmount disabled");
   return true;
 }
 
 void RequestController::UpdateTimer() {
-  LOG4CXX_TRACE_ENTER(logger_);
-  uint32_t sleep_time = dafault_sleep_time_;
-  RequestInfoSet::iterator it = pending_request_set_.begin();
+  LOG4CXX_AUTO_TRACE(logger_);
+  if(pending_request_set_.empty()) {
+    LOG4CXX_DEBUG(logger_, "Sleep for default sleep time "
+                 << dafault_sleep_time_ << " secs");
+    timer_.updateTimeOut(dafault_sleep_time_);
+    return;
+  }
 
+  RequestInfoSet::iterator it = pending_request_set_.begin();
   while (it != pending_request_set_.end()) {
     RequestInfoPtr request = *it;
     DCHECK(request.valid());
-    if (0 == request->timeout_sec()) {
-      ++it;
-      // This request should not be observed for TIME_OUT
-      continue;
+    // This request should not be observed for TIME_OUT
+    if (0 != request->timeout_sec()) {
+      const TimevalStruct current_time = date_time::DateTime::getCurrentTime();
+      const TimevalStruct end_time = request->end_time();
+      if (current_time < end_time) {
+        const uint64_t secs = end_time.tv_sec - current_time.tv_sec;
+        LOG4CXX_DEBUG(logger_, "Sleep for " << secs << " secs");
+        // Timeout for bigger than 5 minutes is a mistake
+        DCHECK(secs < 300);
+        timer_.updateTimeOut(secs);
+      } else {
+        LOG4CXX_DEBUG(logger_, "Request is expired: "
+                      << end_time.tv_sec << " - "
+                      << current_time.tv_sec << " >= "
+                      << request->timeout_sec());
+        timer_.updateTimeOut(0);
+      }
+      return;
     }
-    sleep_time = request->end_time().tv_sec -
-                           date_time::DateTime::getCurrentTime().tv_sec;
-    break;
+    ++it;
   }
-  timer_.updateTimeOut(sleep_time);
-  LOG4CXX_INFO(logger_, "Sleep for: " << sleep_time);
-  LOG4CXX_TRACE_EXIT(logger_);
 }
 
-
 }  //  namespace request_controller
-
 }  //  namespace application_manager
diff --git a/src/components/application_manager/src/request_info.cc b/src/components/application_manager/src/request_info.cc
index 0b448c9e47..82c962a553 100644
--- a/src/components/application_manager/src/request_info.cc
+++ b/src/components/application_manager/src/request_info.cc
@@ -1,34 +1,34 @@
-/**
-* \file request_info.h
-* \brief request information structure source file.
-*
-* Copyright (c) 2014, Ford Motor Company
-* 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 Ford Motor Company 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 HOLDER 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)
+/*
+ * \file request_info.h
+ * \brief request information structure source file.
+ *
+ * Copyright (c) 2014, Ford Motor Company
+ * 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 Ford Motor Company 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 HOLDER 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.
 */
@@ -41,24 +41,26 @@ namespace request_controller {
 HMIRequestInfo::HMIRequestInfo(
     RequestPtr request,
     const uint64_t timeout_sec):
-  RequestInfo(timeout_sec),
+  RequestInfo(HMIRequest, timeout_sec),
   request_(request) {
     correlation_id_ = request_->correlation_id();
+    app_id_ = 0;
 }
 
 HMIRequestInfo::HMIRequestInfo(
     RequestPtr request,
     const TimevalStruct &start_time,
     const uint64_t timeout_sec):
-  RequestInfo(start_time, timeout_sec),
+  RequestInfo(HMIRequest, start_time, timeout_sec),
   request_(request) {
     correlation_id_ = request_->correlation_id();
+    app_id_ = 0;
 }
 
 MobileRequestInfo::MobileRequestInfo(
     RequestPtr request,
     const uint64_t timeout_sec):
-  RequestInfo(timeout_sec),
+  RequestInfo(MobileRequest, timeout_sec),
   request_(request) {
     mobile_correlation_id_ = request_.get()->correlation_id();
     app_id_ = request_.get()->connection_key();
@@ -68,7 +70,7 @@ MobileRequestInfo::MobileRequestInfo(
     RequestPtr request,
     const TimevalStruct &start_time,
     const uint64_t timeout_sec):
-  RequestInfo(start_time, timeout_sec),
+  RequestInfo(MobileRequest, start_time, timeout_sec),
   request_(request) {
     mobile_correlation_id_ = request_.get()->correlation_id();
     app_id_ = request_.get()->connection_key();
diff --git a/src/components/application_manager/src/resume_ctrl.cpp b/src/components/application_manager/src/resume_ctrl.cpp
index cdbd6dc1cf..cdbba3905c 100644
--- a/src/components/application_manager/src/resume_ctrl.cpp
+++ b/src/components/application_manager/src/resume_ctrl.cpp
@@ -1,4 +1,5 @@
-#include <fstream>
+#include <fstream>
+#include <algorithm>
 
 #include "application_manager/resume_ctrl.h"
 #include "config_profile/profile.h"
@@ -23,102 +24,106 @@ namespace Formatters = NsSmartDeviceLink::NsJSONHandler::Formatters;
 
 ResumeCtrl::ResumeCtrl(ApplicationManagerImpl* app_mngr)
   : app_mngr_(app_mngr),
-    timer_("ResumeCtrl", this, &ResumeCtrl::onTimer) {
+    restore_hmi_level_timer_("RsmCtrlRstore",
+                             this, &ResumeCtrl::ApplicationResumptiOnTimer),
+    save_persistent_data_timer_("RsmCtrlPercist",
+                                this, &ResumeCtrl::SaveDataOnTimer, true),
+    is_data_saved(true) {
+  save_persistent_data_timer_.start(profile::Profile::instance()->app_resumption_save_persistent_data_timeout());
 }
 
 void ResumeCtrl::SaveAllApplications() {
-  LOG4CXX_INFO(logger_, "ResumeCtrl::SaveApplications()");
+  LOG4CXX_AUTO_TRACE(logger_);
   DCHECK(app_mngr_);
-
-  std::set<ApplicationSharedPtr>::iterator it =
-                  app_mngr_->application_list_.begin();
-  std::set<ApplicationSharedPtr>::iterator it_end =
-                   app_mngr_->application_list_.end();
-  for (; it != it_end; ++it) {
-    SaveApplication(*it);
+  if (app_mngr_) {
+    ApplicationManagerImpl::ApplicationListAccessor accessor;
+    ApplicationManagerImpl::TAppList apps(accessor.applications());
+    std::for_each(apps.begin(),
+                  apps.end(),
+                  std::bind1st(std::mem_fun(&ResumeCtrl::SaveApplication), this));
+  } else {
+    LOG4CXX_FATAL(logger_, "Application manager object is NULL.");
   }
 }
 
 void ResumeCtrl::SaveApplication(ApplicationConstSharedPtr application) {
-  LOG4CXX_INFO(logger_, "ResumeCtrl::SaveApplication");
-
   DCHECK(application.get());
 
-  Json::Value* json_app = NULL;
-
-  const std::string& m_app_id = application->mobile_app_id()->asString();
-  Json::Value::iterator it = GetSavedApplications().begin();
-  for (; it != GetSavedApplications().end(); ++it) {
-    if (m_app_id == (*it)[strings::app_id].asString()) {
-      json_app = &(*it);
-      LOG4CXX_INFO(logger_, "ResumeCtrl Application with this id "
-                            "already exist ( update info )."
-                            "mobile app_id = " << m_app_id);
-      break;
-    }
-  }
-
-  if (json_app == NULL) {
-    LOG4CXX_INFO(logger_, "ResumeCtrl Application with this ID does not"
-         "exist. Add new. mobile app_id = " << m_app_id);
-    json_app = &(GetSavedApplications().append(Json::Value()));
+  if (!application) {
+    LOG4CXX_FATAL(logger_, "Application object is NULL.");
+    return;
   }
 
-  uint32_t hash = application->curHash();
-  uint32_t grammar_id = application->get_grammar_id();
-
-  LOG4CXX_INFO(logger_, "Hash = " << hash);
-  (*json_app)[strings::device_mac] =
-      MessageHelper::GetDeviceMacAddressForHandle(application->device());
-  (*json_app)[strings::app_id] = m_app_id;
-  (*json_app)[strings::grammar_id] = grammar_id;
-  (*json_app)[strings::connection_key] = application->app_id();
-  (*json_app)[strings::hmi_app_id] = application->hmi_app_id();
-  (*json_app)[strings::hmi_level] =
-      static_cast<int32_t> (application->hmi_level());
-  (*json_app)[strings::ign_off_count] = 0;
-  (*json_app)[strings::hash_id] = hash;
-  (*json_app)[strings::application_commands] =
-      GetApplicationCommands(application);
-  (*json_app)[strings::application_submenus] =
-      GetApplicationSubMenus(application);
-  (*json_app)[strings::application_choise_sets] =
-      GetApplicationInteractionChoiseSets(application);
-  (*json_app)[strings::application_global_properties] =
-      GetApplicationGlobalProperties(application);
-  (*json_app)[strings::application_subscribtions] =
-      GetApplicationSubscriptions(application);
-  (*json_app)[strings::application_files] = GetApplicationFiles(application);
-  (*json_app)[strings::time_stamp] = (uint32_t)time(NULL);
-  (*json_app)[strings::audio_streaming_state] = application->audio_streaming_state();
+  const std::string& m_app_id = application->mobile_app_id()->asString();
+  LOG4CXX_TRACE(logger_, "ENTER app_id : " << application->app_id()
+                << " mobile app_id : " << m_app_id);
+
+  const uint32_t hash = application->curHash();
+  const uint32_t grammar_id = application->get_grammar_id();
+
+  LOG4CXX_INFO(logger_, "hash = " << hash);
+  LOG4CXX_INFO(logger_, "grammar_id = " << grammar_id);
+
+  Json::Value& json_app = GetFromSavedOrAppend(m_app_id);
+
+  json_app[strings::device_mac] =
+    MessageHelper::GetDeviceMacAddressForHandle(application->device());
+  json_app[strings::app_id] = m_app_id;
+  json_app[strings::grammar_id] = grammar_id;
+  json_app[strings::connection_key] = application->app_id();
+  json_app[strings::hmi_app_id] = application->hmi_app_id();
+  json_app[strings::hmi_level] =
+    static_cast<int32_t> (application->hmi_level());
+  json_app[strings::ign_off_count] = 0;
+  json_app[strings::hash_id] = hash;
+  json_app[strings::application_commands] =
+    GetApplicationCommands(application);
+  json_app[strings::application_submenus] =
+    GetApplicationSubMenus(application);
+  json_app[strings::application_choise_sets] =
+    GetApplicationInteractionChoiseSets(application);
+  json_app[strings::application_global_properties] =
+    GetApplicationGlobalProperties(application);
+  json_app[strings::application_subscribtions] =
+    GetApplicationSubscriptions(application);
+  json_app[strings::application_files] = GetApplicationFiles(application);
+  json_app[strings::time_stamp] = (uint32_t)time(NULL);
+  json_app[strings::audio_streaming_state] = application->audio_streaming_state();
+  LOG4CXX_DEBUG(logger_, "SaveApplication : " << json_app.toStyledString());
 }
 
 void ResumeCtrl::on_event(const event_engine::Event& event) {
-  LOG4CXX_INFO(logger_, "ResumeCtrl::on_event ");
+  LOG4CXX_TRACE(logger_, "Response from HMI command");
 }
 
 bool ResumeCtrl::RestoreApplicationHMILevel(ApplicationSharedPtr application) {
-  if (false == application.valid()) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  using namespace mobile_apis;
+  if (!application) {
     LOG4CXX_ERROR(logger_, " RestoreApplicationHMILevel() application pointer in invalid");
     return false;
   }
-  Json::Value::iterator it = GetSavedApplications().begin();
-  for (;it != GetSavedApplications().end(); ++it) {
-    const std::string& saved_m_app_id = (*it)[strings::app_id].asString();
+  LOG4CXX_DEBUG(logger_, "ENTER app_id : " << application->app_id());
 
-    if (saved_m_app_id == application->mobile_app_id()->asString()) {
+  const int idx = GetObjectIndex(application->mobile_app_id()->asString());
+  if (-1 != idx) {
+    const Json::Value& json_app = GetSavedApplications()[idx];
+    if (json_app.isMember(strings::audio_streaming_state) &&
+        json_app.isMember(strings::hmi_level)) {
 
-      mobile_apis::HMILevel::eType saved_hmi_level;
-      //mobile_apis::HMILevel::eType restored_hmi_level;
+      const AudioStreamingState::eType audio_streaming_state =
+          static_cast<mobile_apis::AudioStreamingState::eType>(
+            json_app[strings::audio_streaming_state].asInt());
 
-      mobile_apis::AudioStreamingState::eType audio_streaming_state =
-          static_cast<mobile_apis::AudioStreamingState::eType>
-      ((*it)[strings::audio_streaming_state].asInt());
-        application->set_audio_streaming_state(audio_streaming_state);
-      saved_hmi_level = static_cast<mobile_apis::HMILevel::eType>(
-                            (*it)[strings::hmi_level].asInt());
+      application->set_audio_streaming_state(audio_streaming_state);
 
+      const HMILevel::eType saved_hmi_level =
+          static_cast<mobile_apis::HMILevel::eType>(
+            json_app[strings::hmi_level].asInt());
+      LOG4CXX_DEBUG(logger_, "Saved HMI Level is : " << saved_hmi_level);
       return SetupHMILevel(application, saved_hmi_level, audio_streaming_state);
+    } else {
+      LOG4CXX_FATAL(logger_, "There are some unknown keys among the stored apps");
     }
   }
   LOG4CXX_INFO(logger_, "Failed to restore application HMILevel");
@@ -126,12 +131,11 @@ bool ResumeCtrl::RestoreApplicationHMILevel(ApplicationSharedPtr application) {
 }
 
 bool ResumeCtrl::SetupDefaultHMILevel(ApplicationSharedPtr application) {
-  LOG4CXX_TRACE_ENTER(logger_);
   if (false == application.valid()) {
     LOG4CXX_ERROR(logger_, "SetupDefaultHMILevel application pointer is invalid");
     return false;
   }
-
+  LOG4CXX_TRACE(logger_, "ENTER app_id : " << application->app_id());
   mobile_apis::HMILevel::eType default_hmi = mobile_apis::HMILevel::HMI_NONE;
 
   if (policy::PolicyHandler::instance()->PolicyEnabled()) {
@@ -157,21 +161,23 @@ bool ResumeCtrl::SetupDefaultHMILevel(ApplicationSharedPtr application) {
                     << policy_app_id);
     }
   }
-
-  return SetupHMILevel(application, default_hmi,
-                       mobile_apis::AudioStreamingState::NOT_AUDIBLE, false);
+  bool result = SetupHMILevel(application, default_hmi,
+                         mobile_apis::AudioStreamingState::NOT_AUDIBLE, false);
+  return result;
 }
 
 bool ResumeCtrl::SetupHMILevel(ApplicationSharedPtr application,
                                mobile_apis::HMILevel::eType hmi_level,
                                mobile_apis::AudioStreamingState::eType audio_streaming_state,
                                bool check_policy) {
-
   if (false == application.valid()) {
-    LOG4CXX_ERROR(logger_, "SetupHMILevel() application pointer in invalid");
+    LOG4CXX_ERROR(logger_, "Application pointer in invalid");
     return false;
   }
-
+  LOG4CXX_TRACE(logger_, " ENTER Params : ( " << application->app_id()
+                << "," << hmi_level
+                << "," << audio_streaming_state
+                << "," << check_policy << " )");
   const std::string device_id =
       MessageHelper::GetDeviceMacAddressForHandle(application->device());
 
@@ -188,7 +194,6 @@ bool ResumeCtrl::SetupHMILevel(ApplicationSharedPtr application,
       (hmi_level != mobile_apis::HMILevel::HMI_NONE)) {
     LOG4CXX_WARN(logger_, "Hmi level " << hmi_level << " should not be set to "
                  << application->mobile_app_id()->asString() << "  " << application->hmi_level());
-
     return false;
   }
 
@@ -236,10 +241,9 @@ bool ResumeCtrl::SetupHMILevel(ApplicationSharedPtr application,
 
   if (hmi_level != mobile_apis::HMILevel::HMI_FULL) {
     application->set_hmi_level(hmi_level);
+    MessageHelper::SendHMIStatusNotification(*(application.get()));
+    // HMI status for full wil be get after ActivateApp response
   }
-
-  MessageHelper::SendHMIStatusNotification(*(application.get()));
-
   LOG4CXX_INFO(logger_, "Set up application "
                << application->mobile_app_id()->asString()
                << " to HMILevel " << hmi_level);
@@ -247,271 +251,122 @@ bool ResumeCtrl::SetupHMILevel(ApplicationSharedPtr application,
 }
 
 bool ResumeCtrl::RestoreApplicationData(ApplicationSharedPtr application) {
-  LOG4CXX_INFO(logger_, "RestoreApplicationData");
-  DCHECK(application.get());
-
-  Json::Value::iterator it = GetSavedApplications().begin();
-  for (; it != GetSavedApplications().end(); ++it) {
-    const std::string& saved_m_app_id = (*it)[strings::app_id].asString();
-    if (saved_m_app_id == application->mobile_app_id()->asString()) {
-      break;
-    }
-  }
-
-  if (it == GetSavedApplications().end()) {
-    LOG4CXX_WARN(logger_, "Application not saved");
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!application.valid()) {
+    LOG4CXX_ERROR(logger_, "Application pointer in invalid");
     return false;
   }
 
-  Json::Value& saved_app = *it;
-  MessageHelper::SmartObjectList requests;
-
-  LOG4CXX_INFO(logger_, saved_app.toStyledString());
-  Json::Value& app_commands = saved_app[strings::application_commands];
-  Json::Value& app_submenus = saved_app[strings::application_submenus];
-  Json::Value& app_choise_sets = saved_app[strings::application_choise_sets];
-  Json::Value& global_properties = saved_app[strings::application_global_properties];
-  Json::Value& subscribtions = saved_app[strings::application_subscribtions];
-  Json::Value& application_files = saved_app[strings::application_files];
-  uint32_t app_grammar_id = saved_app[strings::grammar_id].asUInt();
-  application->set_grammar_id(app_grammar_id);
-
-
-  // files
-  for (Json::Value::iterator json_it = application_files.begin();
-      json_it != application_files.end(); ++json_it)  {
-    Json::Value& file_data = *json_it;
-
-    bool is_persistent = file_data[strings::persistent_file].asBool();
-    if (is_persistent) {
-      AppFile file;
-      file.is_persistent = is_persistent;
-      file.is_download_complete = file_data[strings::is_download_complete].asBool();
-      file.file_name = file_data[strings::sync_file_name].asString();
-      file.file_type = static_cast<mobile_apis::FileType::eType> (
-                         file_data[strings::file_type].asInt());
-      LOG4CXX_INFO(logger_, "RestoreApplicationData file " << file.file_name);
-      application->AddFile(file);
-    }
-  }
-
-  //add submenus
-  for (Json::Value::iterator json_it = app_submenus.begin();
-      json_it != app_submenus.end(); ++json_it)  {
-    Json::Value& json_submenu = *json_it;
-    smart_objects::SmartObject message = smart_objects::SmartObject(
-                                         smart_objects::SmartType::SmartType_Map);
-    Formatters::CFormatterJsonBase::jsonValueToObj(json_submenu, message);
-    application->AddSubMenu(message[strings::menu_id].asUInt(), message);
-  }
-  requests = MessageHelper::CreateAddSubMenuRequestToHMI(application);
-
-  for (MessageHelper::SmartObjectList::iterator it = requests.begin();
-       it != requests.end(); ++it) {
-    ProcessHMIRequest(*it, true);
-  }
-
-  //add commands
-  for (Json::Value::iterator json_it = app_commands.begin();
-      json_it != app_commands.end(); ++json_it)  {
-    Json::Value& json_command = *json_it;
-    smart_objects::SmartObject message = smart_objects::SmartObject(
-                                         smart_objects::SmartType::SmartType_Map);
-    Formatters::CFormatterJsonBase::jsonValueToObj(json_command, message);
-    application->AddCommand(message[strings::cmd_id].asUInt(), message);
-  }
-
-  requests = MessageHelper::CreateAddCommandRequestToHMI(application);
-
-  for (MessageHelper::SmartObjectList::iterator it = requests.begin();
-       it != requests.end(); ++it) {
-    ProcessHMIRequest(*it, true);
-  }
-
-  //add choisets
-  for (Json::Value::iterator json_it = app_choise_sets.begin();
-      json_it != app_choise_sets.end(); ++json_it)  {
-    Json::Value& json_choiset = *json_it;
-    smart_objects::SmartObject msg_param = smart_objects::SmartObject(
-                                         smart_objects::SmartType::SmartType_Map);
-    Formatters::CFormatterJsonBase::jsonValueToObj(json_choiset , msg_param);
-    const int32_t choice_set_id = msg_param
-        [strings::interaction_choice_set_id].asInt();
-    uint32_t choice_grammar_id = msg_param[strings::grammar_id].asUInt();
-    application->AddChoiceSet(choice_set_id, msg_param);
-
-    for (size_t j = 0; j < msg_param[strings::choice_set].length(); ++j) {
-      smart_objects::SmartObject choise_params = smart_objects::SmartObject(
-                                                smart_objects::SmartType_Map);
-      choise_params[strings::app_id] = application->app_id();
-      choise_params[strings::cmd_id] =
-          msg_param[strings::choice_set][j][strings::choice_id];
-      choise_params[strings::vr_commands] = smart_objects::SmartObject(
-                                           smart_objects::SmartType_Array);
-      choise_params[strings::vr_commands] =
-          msg_param[strings::choice_set][j][strings::vr_commands];
-
-      choise_params[strings::type] = hmi_apis::Common_VRCommandType::Choice;
-      choise_params[strings::grammar_id] =  choice_grammar_id;
-      SendHMIRequest(hmi_apis::FunctionID::VR_AddCommand, &choise_params);
-    }
-  }
+  LOG4CXX_DEBUG(logger_, "ENTER app_id : " << application->app_id());
 
-  //setglobal properties
-  if (!global_properties.isNull()) {
-    smart_objects::SmartObject properties_so = smart_objects::SmartObject(
-                                         smart_objects::SmartType::SmartType_Map);
-    Formatters::CFormatterJsonBase::jsonValueToObj(global_properties , properties_so);
 
-    const smart_objects::SmartObject& vr_help_title =
-        properties_so.getElement(strings::vr_help_title);
-    if (vr_help_title.getType() != smart_objects::SmartType::SmartType_Invalid &&
-        vr_help_title.getType() != smart_objects::SmartType::SmartType_Null) {
-      application->set_vr_help_title(vr_help_title);
-    }
-
-    const smart_objects::SmartObject& vr_help =
-        properties_so.getElement(strings::vr_help);
-    if (vr_help.getType() != smart_objects::SmartType::SmartType_Invalid  &&
-        vr_help.getType() != smart_objects::SmartType::SmartType_Null) {
-      application->set_vr_help(vr_help);
-    }
-
-    const smart_objects::SmartObject& timeout_prompt =
-        properties_so.getElement(strings::timeout_prompt);
-    if (timeout_prompt.getType() != smart_objects::SmartType::SmartType_Invalid  &&
-        timeout_prompt.getType() != smart_objects::SmartType::SmartType_Null) {
-      application->set_timeout_prompt(timeout_prompt);
-    }
-
-    const smart_objects::SmartObject& help_prompt =
-        properties_so.getElement(strings::help_prompt);
-    if (help_prompt.getType() != smart_objects::SmartType::SmartType_Invalid &&
-        help_prompt.getType() != smart_objects::SmartType::SmartType_Null) {
-      application->set_help_prompt(help_prompt);
-    }
-
-    const smart_objects::SmartObject& keyboard_properties =
-        properties_so.getElement(strings::keyboard_properties);
-    if (keyboard_properties.getType() != smart_objects::SmartType::SmartType_Invalid  &&
-        keyboard_properties.getType() != smart_objects::SmartType::SmartType_Null) {
-      application->set_keyboard_props(keyboard_properties);
-    }
-
-    const smart_objects::SmartObject& menu_title =
-        properties_so.getElement(strings::menu_title);
-    if (menu_title.getType() != smart_objects::SmartType::SmartType_Invalid  &&
-        menu_title.getType() != smart_objects::SmartType::SmartType_Null) {
-      application->set_menu_title(menu_title);
-    }
-
-    const smart_objects::SmartObject& menu_icon =
-        properties_so.getElement(strings::menu_icon);
-    if (menu_icon.getType() != smart_objects::SmartType::SmartType_Invalid  &&
-        menu_icon.getType() != smart_objects::SmartType::SmartType_Null) {
-      application->set_menu_icon(menu_icon);
-    }
-
-    MessageHelper::SendGlobalPropertiesToHMI(application);
+  const int idx = GetObjectIndex(application->mobile_app_id()->asString());
+  if (-1 == idx) {
+    LOG4CXX_WARN(logger_, "Application not saved");
+    return false;
   }
 
-  //subscribes
-  if (!subscribtions.isNull()) {
-    Json::Value& subscribtions_buttons = subscribtions[strings::application_buttons];
-    Json::Value& subscribtions_ivi= subscribtions[strings::application_vehicle_info];
-    for (Json::Value::iterator json_it = subscribtions_buttons.begin();
-         json_it != subscribtions_buttons.end(); ++json_it) {
-      mobile_apis::ButtonName::eType btn;
-      btn = static_cast<mobile_apis::ButtonName::eType>((*json_it).asInt());
-      application->SubscribeToButton(btn);
-    }
-
-    for (Json::Value::iterator json_it = subscribtions_ivi.begin();
-         json_it != subscribtions_ivi.end(); ++json_it) {
-      VehicleDataType ivi;
-      ivi = static_cast<VehicleDataType>((*json_it).asInt());
-      LOG4CXX_INFO(logger_, "VehicleDataType :" <<  ivi);
-#ifdef ENABLE_LOG
-      bool result =
-#endif
-      application->SubscribeToIVI(ivi);
-      LOG4CXX_INFO(logger_, "result = :" <<  result);
-    }
-    requests = MessageHelper::GetIVISubscribtionRequests(application->app_id());
+  const Json::Value& saved_app = GetSavedApplications()[idx];
+  if(saved_app.isMember(strings::grammar_id)) {
+    const uint32_t app_grammar_id = saved_app[strings::grammar_id].asUInt();
+    application->set_grammar_id(app_grammar_id);
 
-    for (MessageHelper::SmartObjectList::iterator it = requests.begin();
-         it != requests.end(); ++it) {
-      ProcessHMIRequest(*it,true);
-    }
+    AddFiles(application, saved_app);
+    AddSubmenues(application, saved_app);
+    AddCommands(application, saved_app);
+    AddChoicesets(application, saved_app);
+    SetGlobalProperties(application, saved_app);
+    AddSubscriptions(application, saved_app);
   }
   return true;
 }
 
 bool ResumeCtrl::IsHMIApplicationIdExist(uint32_t hmi_app_id) {
-  LOG4CXX_INFO(logger_, "ResumeCtrl::IsHMIApplicationIdExist " << hmi_app_id);
+  LOG4CXX_TRACE(logger_, "ENTER hmi_app_id :"  << hmi_app_id);
 
   for (Json::Value::iterator it = GetSavedApplications().begin();
       it != GetSavedApplications().end(); ++it) {
-    if ((*it)[strings::hmi_app_id].asUInt() == hmi_app_id) {
-      return true;
+    if ((*it).isMember(strings::hmi_app_id)) {
+      if ((*it)[strings::hmi_app_id].asUInt() == hmi_app_id) {
+        return true;
+      }
     }
   }
+  ApplicationManagerImpl::ApplicationListAccessor accessor;
+  std::set<ApplicationSharedPtr>::iterator it = accessor.applications().begin();
+  std::set<ApplicationSharedPtr>::iterator it_end = accessor.applications().end();
 
-  std::set<ApplicationSharedPtr>::iterator it =
-                                  app_mngr_->application_list_.begin();
-  std::set<ApplicationSharedPtr>::iterator it_end =
-                                   app_mngr_->application_list_.end();
   for (;it != it_end; ++it) {
     if (hmi_app_id == (*it)->hmi_app_id()) {
+      LOG4CXX_TRACE(logger_, "EXIT result = true");
       return true;
     }
   }
-
+  LOG4CXX_TRACE(logger_, "EXIT result = false");
   return false;
 }
 
 bool ResumeCtrl::IsApplicationSaved(const std::string& mobile_app_id) {
+  LOG4CXX_TRACE(logger_, "ENTER mobile_app_id :"  << mobile_app_id);
   bool result = false;
   for (Json::Value::iterator it = GetSavedApplications().begin();
       it != GetSavedApplications().end(); ++it) {
-    if ((*it)[strings::app_id].asString() == mobile_app_id) {
-      result = true;
+    if ((*it).isMember(strings::app_id)) {
+      if ((*it)[strings::app_id].asString() == mobile_app_id) {
+        result = true;
+      }
     }
   }
-  LOG4CXX_INFO(logger_, "IsApplicationSaved " << mobile_app_id << " : " << (result?"true":"false"));
+  LOG4CXX_TRACE(logger_, "EXIT mobile_app_id :" <<
+                mobile_app_id <<
+                " result: " <<
+                (result ? "true" : "false"));
   return result;
 }
 
 uint32_t ResumeCtrl::GetHMIApplicationID(const std::string& mobile_app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
   uint32_t hmi_app_id = 0;
-  for (Json::Value::iterator it = GetSavedApplications().begin();
-      it != GetSavedApplications().end(); ++it) {
-    if ((*it)[strings::app_id].asString() == mobile_app_id) {
-      hmi_app_id = (*it)[strings::hmi_app_id].asUInt();
-    }
+
+  const int idx = GetObjectIndex(mobile_app_id);
+  if (-1 == idx) {
+    LOG4CXX_WARN(logger_, "Application not saved");
+    return hmi_app_id;
   }
 
+  const Json::Value& json_app = GetSavedApplications()[idx];
+  if (json_app.isMember(strings::app_id)) {
+      hmi_app_id = json_app[strings::hmi_app_id].asUInt();
+  }
+  LOG4CXX_DEBUG(logger_, "hmi_app_id :"  << hmi_app_id);
   return hmi_app_id;
 }
 
 bool ResumeCtrl::RemoveApplicationFromSaved(ApplicationConstSharedPtr application) {
-  LOG4CXX_INFO(logger_, "ResumeCtrl::RemoveApplicationFromSaved ");
-  DCHECK(application.get());
+  if (false == application.valid()) {
+    LOG4CXX_ERROR(logger_, "Application pointer in invalid");
+    return false;
+  }
+  LOG4CXX_TRACE(logger_, "ENTER app_id :"  << application->app_id()
+                << "; mobile_app_id " << application->mobile_app_id()->asString());
 
   bool result = false;
   std::vector<Json::Value> temp;
   for (Json::Value::iterator it = GetSavedApplications().begin();
       it != GetSavedApplications().end(); ++it) {
-    const std::string& saved_m_app_id = (*it)[strings::app_id].asString();
+    if ((*it).isMember(strings::app_id)) {
+      const std::string& saved_m_app_id = (*it)[strings::app_id].asString();
 
-    if (saved_m_app_id != application->mobile_app_id()->asString()) {
-      temp.push_back((*it));
-    } else {
-      result = true;
+      if (saved_m_app_id != application->mobile_app_id()->asString()) {
+        temp.push_back((*it));
+      } else {
+        result = true;
+      }
     }
   }
 
   if (false == result) {
+    LOG4CXX_TRACE(logger_, "EXIT result: " << (result ? "true" : "false"));
     return result;
   }
 
@@ -520,163 +375,147 @@ bool ResumeCtrl::RemoveApplicationFromSaved(ApplicationConstSharedPtr applicatio
       it != temp.end(); ++it) {
     GetSavedApplications().append((*it));
   }
+  LOG4CXX_TRACE(logger_, "EXIT result: " << (result ? "true" : "false"));
   return result;
 }
 
 void ResumeCtrl::IgnitionOff() {
-  LOG4CXX_INFO(logger_, "ResumeCtrl::IgnitionOff()");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   Json::Value to_save;
   for (Json::Value::iterator it = GetSavedApplications().begin();
       it != GetSavedApplications().end(); ++it) {
-    uint32_t ign_off_count = (*it)[strings::ign_off_count].asUInt();
-    if (ign_off_count < kApplicationLifes) {
-      ign_off_count++;
-      (*it)[strings::ign_off_count] = ign_off_count;
-      to_save.append(*it);
+    if ((*it).isMember(strings::ign_off_count)) {
+      const uint32_t ign_off_count = (*it)[strings::ign_off_count].asUInt();
+      if (ign_off_count < kApplicationLifes) {
+        (*it)[strings::ign_off_count] = ign_off_count + 1;
+        to_save.append(*it);
+      }
+    } else {
+      LOG4CXX_FATAL(logger_, "Unknown key among saved applications");
+      return;
     }
   }
   SetSavedApplication(to_save);
 }
 
+
 bool ResumeCtrl::StartResumption(ApplicationSharedPtr application,
                                  uint32_t hash) {
-  LOG4CXX_INFO(logger_, "ResumeCtrl::StartResumption");
-  if (!application.valid()) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!application) {
     LOG4CXX_WARN(logger_, "Application not exist");
     return false;
   }
-
-  LOG4CXX_INFO(logger_, " app_id = " << application->app_id()
+  LOG4CXX_DEBUG(logger_, " Resume app_id = " << application->app_id()
                         << " hmi_app_id = " << application->hmi_app_id()
-                        << " mobile_id = "
-                        << application->mobile_app_id()->asString());
-
-  Json::Value::iterator it = GetSavedApplications().begin();
-  ApplicationManagerImpl::ApplicationListAccessor accessor;
-  for (; it != GetSavedApplications().end(); ++it) {
-    const std::string& saved_m_app_id = (*it)[strings::app_id].asString();
+                        << " mobile_id = " << application->mobile_app_id()->asString()
+                        << "recieved hash = " << hash);
 
-    if (saved_m_app_id == application->mobile_app_id()->asString()) {
-
-      uint32_t saved_hash = (*it)[strings::hash_id].asUInt();
-      uint32_t time_stamp= (*it)[strings::time_stamp].asUInt();
+  const int idx = GetObjectIndex(application->mobile_app_id()->asString());
+  if (-1 == idx) {
+    LOG4CXX_WARN(logger_, "Application not saved");
+    MessageHelper::SendHMIStatusNotification(*application);
+    return false;
+  }
 
-      if (hash == saved_hash) {
-        RestoreApplicationData(application);
-      }
+  const Json::Value& json_app = GetSavedApplications()[idx];
+  if (json_app.isMember(strings::hash_id) && json_app.isMember(strings::time_stamp)) {
+    const uint32_t saved_hash = json_app[strings::hash_id].asUInt();
 
-      application->UpdateHash();
-      if (!timer_.isRunning() && accessor.applications().size() > 1) {
-        RestoreApplicationHMILevel(application);
-        RemoveApplicationFromSaved(application);
-      } else {
-        sync_primitives::AutoLock auto_lock(queue_lock_);
-        SetupDefaultHMILevel(application);
-        waiting_for_timer_.insert(std::make_pair(application->app_id(),
-                                                 time_stamp));
-        timer_.start(kTimeStep);
-      }
-      return true;
+    if (saved_hash == hash) {
+      RestoreApplicationData(application);
     }
+    application->UpdateHash();
+    RestoreHmiLevel(json_app[strings::time_stamp].asUInt(), application);
+    return true;
+  } else {
+    LOG4CXX_INFO(logger_, "There are some unknown keys in the dictionary.");
   }
 
-  LOG4CXX_INFO(logger_, "ResumeCtrl::Application wasn't saved");
-  MessageHelper::SendHMIStatusNotification(*application);
   return false;
 }
 
+void ResumeCtrl::RestoreHmiLevel(uint32_t time_stamp,
+                                 ApplicationSharedPtr application) {
+  ApplicationManagerImpl::ApplicationListAccessor accessor;
+  if (!restore_hmi_level_timer_.isRunning() &&
+      accessor.applications().size() > 1) {
+    // resume in case there is already registered app
+    RestoreApplicationHMILevel(application);
+    RemoveApplicationFromSaved(application);
+  } else {
+    // please avoid AutoLock usage to avoid deadlock
+    SetupDefaultHMILevel(application);
+    InsertToTimerQueue(application->app_id(), time_stamp);
+    // woun't start timer if it is active already
+    LOG4CXX_DEBUG(logger_, "Application " << application->app_id() << " inserted to timer queue. "
+                  << "timer started for " << profile::Profile::instance()->app_resuming_timeout());
+    restore_hmi_level_timer_.start(profile::Profile::instance()->app_resuming_timeout());
+  }
+}
+
 bool ResumeCtrl::StartResumptionOnlyHMILevel(ApplicationSharedPtr application) {
-  LOG4CXX_INFO(logger_, "ResumeCtrl::StartResumptionOnlyHMILevel");
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!application.valid()) {
-    LOG4CXX_WARN(logger_, "Application not exist");
+    LOG4CXX_WARN(logger_, "Application do not exists");
     return false;
   }
 
-  LOG4CXX_INFO(logger_, "app_id = " << application->app_id()
+  LOG4CXX_DEBUG(logger_, "ENTER app_id = " << application->app_id()
                         << "mobile_id = "
                         << application->mobile_app_id()->asString());
 
-  Json::Value::iterator it = GetSavedApplications().begin();
-  ApplicationManagerImpl::ApplicationListAccessor accessor;
-  for (; it != GetSavedApplications().end(); ++it) {
-    const std::string& saved_m_app_id = (*it)[strings::app_id].asString();
-    if (saved_m_app_id == application->mobile_app_id()->asString()) {
-      uint32_t time_stamp= (*it)[strings::time_stamp].asUInt();
-      if (!timer_.isRunning() && accessor.applications().size() > 1) {
-        // resume in case there is already registered app
-        RestoreApplicationHMILevel(application);
-        RemoveApplicationFromSaved(application);
-      } else {
-        sync_primitives::AutoLock auto_lock(queue_lock_);
-        SetupDefaultHMILevel(application);
-        waiting_for_timer_.insert(std::make_pair(application->app_id(),
-                                                 time_stamp));
-        // woun't start timer if it is active already
-        timer_.start(kTimeStep);
-      }
-      return true;
-    }
+  const int idx = GetObjectIndex(application->mobile_app_id()->asString());
+  if (-1 == idx) {
+    LOG4CXX_WARN(logger_, "Application not saved");
+    MessageHelper::SendHMIStatusNotification(*application);
+    return false;
+  }
+
+  const Json::Value& json = GetSavedApplications()[idx];
+  if (json.isMember(strings::time_stamp)) {
+    const uint32_t time_stamp = json[strings::time_stamp].asUInt();
+    RestoreHmiLevel(time_stamp, application);
+    return true;
+  } else {
+    LOG4CXX_FATAL(logger_, "The key " << strings::time_stamp <<
+                  " doesn't exists among saved apps.");
   }
 
   LOG4CXX_INFO(logger_, "ResumeCtrl::Application wasn't saved");
   MessageHelper::SendHMIStatusNotification(*application);
+  LOG4CXX_TRACE(logger_, "EXIT false");
   return false;
 }
 
 bool ResumeCtrl::CheckPersistenceFilesForResumption(ApplicationSharedPtr application) {
-  LOG4CXX_INFO(logger_, "CheckPersistenceFilesForResumption");
-  DCHECK(application.get());
-
-  Json::Value::iterator it = GetSavedApplications().begin();
-  for (; it != GetSavedApplications().end(); ++it) {
-    const std::string& saved_m_app_id = (*it)[strings::app_id].asString();
+  LOG4CXX_AUTO_TRACE(logger_);
 
-    if (saved_m_app_id == application->mobile_app_id()->asString()) {
-      break;
-    }
+  if (!application.valid()) {
+    LOG4CXX_WARN(logger_, "Application do not exists");
+    return false;
   }
+  LOG4CXX_DEBUG(logger_, "Process app_id = " << application->app_id());
 
-  if (it == GetSavedApplications().end()) {
+  const int idx = GetObjectIndex(application->mobile_app_id()->asString());
+  if (-1 == idx) {
     LOG4CXX_WARN(logger_, "Application not saved");
     return false;
   }
 
-  Json::Value& saved_app = *it;
-  MessageHelper::SmartObjectList requests;
-
-  LOG4CXX_INFO(logger_, saved_app.toStyledString());
-  Json::Value& app_commands = saved_app[strings::application_commands];
-  Json::Value& app_choise_sets = saved_app[strings::application_choise_sets];
-
-  //add commands
-  for (Json::Value::iterator json_it = app_commands.begin();
-      json_it != app_commands.end(); ++json_it)  {
-    Json::Value& json_command = *json_it;
-    smart_objects::SmartObject message =
-        smart_objects::SmartObject(smart_objects::SmartType::SmartType_Map);
-    Formatters::CFormatterJsonBase::jsonValueToObj(json_command, message);
-    mobile_apis::Result::eType verification_result =
-        MessageHelper::VerifyImageFiles(message, application);
-    if (verification_result == mobile_apis::Result::INVALID_DATA) {
-      LOG4CXX_WARN(logger_, "app_commands missed icons");
-      return false;
-    }
+  const Json::Value& saved_app = GetSavedApplications()[idx];
+
+  if (!saved_app.isMember(strings::application_commands) ||
+      !saved_app.isMember(strings::application_choise_sets)) {
+    return false;
   }
 
-  //add choice sets
-  for (Json::Value::iterator json_it = app_choise_sets.begin();
-      json_it != app_choise_sets.end(); ++json_it)  {
-    Json::Value& json_choiset = *json_it;
-    smart_objects::SmartObject msg_param =
-        smart_objects::SmartObject(smart_objects::SmartType::SmartType_Map);
-    Formatters::CFormatterJsonBase::jsonValueToObj(json_choiset , msg_param);
-    mobile_apis::Result::eType verification_result =
-        MessageHelper::VerifyImageFiles(msg_param, application);
-    if (verification_result == mobile_apis::Result::INVALID_DATA) {
-      LOG4CXX_WARN(logger_, "app_choise_sets missed icons");
-      return false;
-    }
+  if (!CheckIcons(application, saved_app[strings::application_commands])) {
+    return false;
+  }
+  if (!CheckIcons(application, saved_app[strings::application_choise_sets])) {
+    return false;
   }
 
   return true;
@@ -684,26 +523,39 @@ bool ResumeCtrl::CheckPersistenceFilesForResumption(ApplicationSharedPtr applica
 
 bool ResumeCtrl::CheckApplicationHash(ApplicationSharedPtr application,
                                       uint32_t hash) {
-  Json::Value::iterator it = GetSavedApplications().begin();
-  for (; it != GetSavedApplications().end(); ++it) {
-    std::string saved_m_app_id = (*it)[strings::app_id].asString();
-
-    if (saved_m_app_id == application->mobile_app_id()->asString()) {
-      uint32_t saved_hash = (*it)[strings::hash_id].asUInt();
-      LOG4CXX_INFO(logger_, "received hash = " << hash);
-      LOG4CXX_INFO(logger_, "saved hash = " << saved_hash);
-      if (hash == saved_hash) {
-        return true;
-      }
+  if (!application) {
+    LOG4CXX_ERROR(logger_, "Application pointer is invalid");
+    return false;
+  }
+
+  LOG4CXX_DEBUG(logger_, "ENTER app_id : " << application->app_id()
+                << " hash : " << hash);
+
+  const int idx = GetObjectIndex(application->mobile_app_id()->asString());
+  if (-1 == idx) {
+    LOG4CXX_WARN(logger_, "Application not saved");
+    return false;
+  }
+
+  const Json::Value& json_app = GetSavedApplications()[idx];
+
+  if (json_app.isMember(strings::hash_id)) {
+    const uint32_t saved_hash = json_app[strings::hash_id].asUInt();
+
+    LOG4CXX_TRACE(logger_, "Found saved application : " << json_app.toStyledString());
+    LOG4CXX_INFO(logger_, "received hash = " << hash);
+    LOG4CXX_INFO(logger_, "saved hash = " << saved_hash);
+    if (hash == saved_hash) {
+      return true;
     }
   }
 
   return false;
 }
 
-void ResumeCtrl::onTimer() {
-  LOG4CXX_INFO(logger_, "ResumeCtrl::onTimer() size is "
-                         << waiting_for_timer_.size());
+void ResumeCtrl::ApplicationResumptiOnTimer() {
+  LOG4CXX_TRACE(logger_, "ENTER waiting for resumption HMI_Level count is :"
+                << waiting_for_timer_.size());
   sync_primitives::AutoLock auto_lock(queue_lock_);
 
   std::multiset<application_timestamp, TimeStampComparator>::iterator it=
@@ -722,13 +574,26 @@ void ResumeCtrl::onTimer() {
   }
 
   waiting_for_timer_.clear();
+  LOG4CXX_TRACE(logger_, "EXIT");
+}
+
+void ResumeCtrl::SaveDataOnTimer() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (waiting_for_timer_.size() > 0) {
+    LOG4CXX_INFO(logger_, "There are some applications, that are waiting for resumption HMILevel. Data should not be saved");
+    return;
+  }
+  if (false == is_data_saved) {
+    SaveAllApplications();
+    is_data_saved = true;
+    resumption::LastState::instance()->SaveToFileSystem();
+  }
 }
 
 bool ResumeCtrl::IsDeviceMacAddressEqual(ApplicationSharedPtr application,
                                          const std::string& saved_device_mac) {
   const std::string device_mac =
       MessageHelper::GetDeviceMacAddressForHandle(application->device());
-
   return device_mac == saved_device_mac;
 }
 
@@ -741,27 +606,28 @@ void ResumeCtrl::SetSavedApplication(Json::Value& apps_json) {
 }
 
 void ResumeCtrl::ClearResumptionInfo() {
-	Json::Value empty_json;
+  LOG4CXX_AUTO_TRACE(logger_);
+  Json::Value empty_json;
 
-	SetSavedApplication(empty_json);
-	resumption::LastState::instance()->SaveToFileSystem();
+  SetSavedApplication(empty_json);
+  resumption::LastState::instance()->SaveToFileSystem();
 }
 
 Json::Value ResumeCtrl::GetApplicationCommands(
     ApplicationConstSharedPtr application) {
   DCHECK(application.get());
-  LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationCommands "
+  LOG4CXX_TRACE(logger_, "ENTER app_id:"
                << application->app_id());
 
   Json::Value result;
-  const CommandsMap& commands = application->commands_map();
+  const DataAccessor<CommandsMap> accessor = application->commands_map();
+  const CommandsMap& commands = accessor.GetData();
   CommandsMap::const_iterator it = commands.begin();
   for (;it != commands.end(); ++it) {
     smart_objects::SmartObject* so = it->second;
     Json::Value curr;
     Formatters::CFormatterJsonBase::objToJsonValue(*so, curr);
     result.append(curr);
-    LOG4CXX_INFO(logger_, "Converted:" << curr.toStyledString());
   }
   return result;
 }
@@ -769,18 +635,18 @@ Json::Value ResumeCtrl::GetApplicationCommands(
 Json::Value ResumeCtrl::GetApplicationSubMenus(
     ApplicationConstSharedPtr application) {
   DCHECK(application.get());
-  LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationCommands "
+  LOG4CXX_TRACE(logger_, "ENTER app_id:"
                << application->app_id());
 
   Json::Value result;
-  const SubMenuMap& sub_menus = application->sub_menu_map();
+  const DataAccessor<SubMenuMap> accessor = application->sub_menu_map();
+  const SubMenuMap& sub_menus = accessor.GetData();
   SubMenuMap::const_iterator it = sub_menus.begin();
   for (;it != sub_menus.end(); ++it) {
     smart_objects::SmartObject* so = it->second;
     Json::Value curr;
     Formatters::CFormatterJsonBase::objToJsonValue(*so, curr);
     result.append(curr);
-    LOG4CXX_INFO(logger_, "Converted:" << curr.toStyledString());
   }
   return result;
 }
@@ -788,18 +654,18 @@ Json::Value ResumeCtrl::GetApplicationSubMenus(
 Json::Value ResumeCtrl::GetApplicationInteractionChoiseSets(
     ApplicationConstSharedPtr application) {
   DCHECK(application.get());
-  LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationInteractionChoiseSets "
+  LOG4CXX_TRACE(logger_, "ENTER app_id:"
                << application->app_id());
 
   Json::Value result;
-  const ChoiceSetMap& choices = application->choice_set_map();
+  const DataAccessor<ChoiceSetMap> accessor = application->choice_set_map();
+  const ChoiceSetMap& choices = accessor.GetData();
   ChoiceSetMap::const_iterator it = choices.begin();
   for ( ;it != choices.end(); ++it) {
     smart_objects::SmartObject* so = it->second;
     Json::Value curr;
     Formatters::CFormatterJsonBase::objToJsonValue(*so, curr);
     result.append(curr);
-    LOG4CXX_INFO(logger_, "Converted:" << curr.toStyledString());
   }
   return result;
 }
@@ -807,10 +673,9 @@ Json::Value ResumeCtrl::GetApplicationInteractionChoiseSets(
 Json::Value ResumeCtrl::GetApplicationGlobalProperties(
     ApplicationConstSharedPtr application) {
   DCHECK(application.get());
-  LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationGlobalProperties "
+  LOG4CXX_TRACE(logger_, "ENTER app_id:"
                << application->app_id());
 
-  Json::Value result;
   const smart_objects::SmartObject* help_promt = application->help_prompt();
   const smart_objects::SmartObject* timeout_prompt = application->timeout_prompt();
   const smart_objects::SmartObject* vr_help = application->vr_help();
@@ -829,27 +694,24 @@ Json::Value ResumeCtrl::GetApplicationGlobalProperties(
   sgp[strings::keyboard_properties] = JsonFromSO(keyboard_props);
   sgp[strings::menu_title] = JsonFromSO(menu_title);
   sgp[strings::menu_icon] = JsonFromSO(menu_icon);
-
   return sgp;
 }
 
 Json::Value ResumeCtrl::GetApplicationSubscriptions(
     ApplicationConstSharedPtr application) {
+  LOG4CXX_AUTO_TRACE(logger_);
   DCHECK(application.get());
-  LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationSubscriptions "
-               << application->app_id());
-
   Json::Value result;
-  std::set<mobile_apis::ButtonName::eType>::iterator it_button ;
-  std::set<uint32_t>::iterator it_vehicle;
+  if (!application) {
+    LOG4CXX_DEBUG(logger_, "ENTER app_id:" << application->app_id());
 
-  for (it_button = application->SubscribedButtons().begin() ;
-       it_button != application->SubscribedButtons().end(); ++it_button) {
-    result[strings::application_buttons].append(*it_button);
-  }
-  for (it_vehicle = application->SubscribesIVI().begin();
-       it_vehicle != application->SubscribesIVI().end(); ++it_vehicle) {
-    result[strings::application_vehicle_info].append(*it_vehicle);
+    Append(application->SubscribedButtons().begin(),
+                        application->SubscribedButtons().end(),
+                        strings::application_buttons, result);
+
+    Append(application->SubscribedButtons().begin(),
+                        application->SubscribedButtons().end(),
+                        strings::application_vehicle_info, result);
   }
   return result;
 }
@@ -857,7 +719,7 @@ Json::Value ResumeCtrl::GetApplicationSubscriptions(
 Json::Value ResumeCtrl::GetApplicationFiles(
     ApplicationConstSharedPtr application) {
   DCHECK(application.get());
-  LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationFiles "
+  LOG4CXX_TRACE(logger_, "ENTER app_id:"
                << application->app_id());
 
   Json::Value result;
@@ -880,8 +742,8 @@ Json::Value ResumeCtrl::GetApplicationFiles(
 Json::Value ResumeCtrl::GetApplicationShow(
     ApplicationConstSharedPtr application) {
   DCHECK(application.get());
-  LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationShow "
-                 << application->app_id());
+  LOG4CXX_TRACE(logger_, "ENTER app_id:"
+               << application->app_id());
 
   Json::Value result;
   const smart_objects::SmartObject* show_so = application->show_command();
@@ -902,6 +764,7 @@ Json::Value ResumeCtrl::JsonFromSO(const smart_objects::SmartObject *so) {
 
 bool ResumeCtrl::ProcessHMIRequest(smart_objects::SmartObject* request,
                                    bool use_events) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (use_events) {
     const hmi_apis::FunctionID::eType function_id =
         static_cast<hmi_apis::FunctionID::eType>(
@@ -918,10 +781,207 @@ bool ResumeCtrl::ProcessHMIRequest(smart_objects::SmartObject* request,
   return false;
 }
 
+void ResumeCtrl::InsertToTimerQueue(uint32_t app_id, uint32_t time_stamp) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock autolock(queue_lock_);
+  LOG4CXX_DEBUG(logger_,"After queue_lock_ Accure");
+  waiting_for_timer_.insert(std::make_pair(app_id, time_stamp));
+}
+
+void ResumeCtrl::AddFiles(ApplicationSharedPtr application, const Json::Value& saved_app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (saved_app.isMember(strings::application_files)) {
+    const Json::Value& application_files = saved_app[strings::application_files];
+    for (Json::Value::iterator json_it = application_files.begin();
+        json_it != application_files.end(); ++json_it)  {
+      const Json::Value& file_data = *json_it;
+
+      const bool is_persistent = file_data.isMember(strings::persistent_file) &&
+          file_data[strings::persistent_file].asBool();
+      if (is_persistent) {
+        AppFile file;
+        file.is_persistent = is_persistent;
+        file.is_download_complete = file_data[strings::is_download_complete].asBool();
+        file.file_name = file_data[strings::sync_file_name].asString();
+        file.file_type = static_cast<mobile_apis::FileType::eType> (
+                           file_data[strings::file_type].asInt());
+        application->AddFile(file);
+      }
+    }
+  } else {
+    LOG4CXX_FATAL(logger_, "application_files section is not exists");
+  }
+}
+
+void ResumeCtrl::AddSubmenues(ApplicationSharedPtr application, const Json::Value& saved_app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (saved_app.isMember(strings::application_submenus)) {
+    const Json::Value& app_submenus = saved_app[strings::application_submenus];
+    for (Json::Value::iterator json_it = app_submenus.begin();
+        json_it != app_submenus.end(); ++json_it) {
+      const Json::Value& json_submenu = *json_it;
+      smart_objects::SmartObject message(smart_objects::SmartType::SmartType_Map);
+      Formatters::CFormatterJsonBase::jsonValueToObj(json_submenu, message);
+      application->AddSubMenu(message[strings::menu_id].asUInt(), message);
+    }
+
+    ProcessHMIRequests(MessageHelper::CreateAddSubMenuRequestToHMI(application));
+  } else {
+    LOG4CXX_FATAL(logger_, "application_submenus section is not exists");
+  }
+}
+
+void ResumeCtrl::AddCommands(ApplicationSharedPtr application, const Json::Value& saved_app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (saved_app.isMember(strings::application_commands)) {
+    const Json::Value& app_commands = saved_app[strings::application_commands];
+    for (Json::Value::iterator json_it = app_commands.begin();
+        json_it != app_commands.end(); ++json_it)  {
+      const Json::Value& json_command = *json_it;
+      smart_objects::SmartObject message(smart_objects::SmartType::SmartType_Map);
+      Formatters::CFormatterJsonBase::jsonValueToObj(json_command, message);
+      application->AddCommand(message[strings::cmd_id].asUInt(), message);
+    }
+
+    ProcessHMIRequests(MessageHelper::CreateAddCommandRequestToHMI(application));
+  } else {
+     LOG4CXX_FATAL(logger_, "application_commands section is not exists");
+   }
+}
+
+void ResumeCtrl::AddChoicesets(ApplicationSharedPtr application, const Json::Value& saved_app) {
+  if(saved_app.isMember(strings::application_choise_sets)) {
+    const Json::Value& app_choise_sets = saved_app[strings::application_choise_sets];
+    for (Json::Value::iterator json_it = app_choise_sets.begin();
+        json_it != app_choise_sets.end(); ++json_it)  {
+      const Json::Value& json_choiset = *json_it;
+      smart_objects::SmartObject msg_param(smart_objects::SmartType::SmartType_Map);
+      Formatters::CFormatterJsonBase::jsonValueToObj(json_choiset , msg_param);
+      const int32_t choice_set_id = msg_param
+          [strings::interaction_choice_set_id].asInt();
+      uint32_t choice_grammar_id = msg_param[strings::grammar_id].asUInt();
+      application->AddChoiceSet(choice_set_id, msg_param);
+
+      const size_t size = msg_param[strings::choice_set].length();
+      for (size_t j = 0; j < size; ++j) {
+        smart_objects::SmartObject choise_params(smart_objects::SmartType_Map);
+        choise_params[strings::app_id] = application->app_id();
+        choise_params[strings::cmd_id] =
+            msg_param[strings::choice_set][j][strings::choice_id];
+        choise_params[strings::vr_commands] = smart_objects::SmartObject(
+                                             smart_objects::SmartType_Array);
+        choise_params[strings::vr_commands] =
+            msg_param[strings::choice_set][j][strings::vr_commands];
+
+        choise_params[strings::type] = hmi_apis::Common_VRCommandType::Choice;
+        choise_params[strings::grammar_id] =  choice_grammar_id;
+        SendHMIRequest(hmi_apis::FunctionID::VR_AddCommand, &choise_params);
+      }
+    }
+  } else {
+    LOG4CXX_FATAL(logger_, "There is no any choicesets");
+  }
+}
+
+void ResumeCtrl::SetGlobalProperties(ApplicationSharedPtr application, const Json::Value& saved_app) {
+  const Json::Value& global_properties = saved_app[strings::application_global_properties];
+  if (!global_properties.isNull()) {
+    smart_objects::SmartObject properties_so(smart_objects::SmartType::SmartType_Map);
+    Formatters::CFormatterJsonBase::jsonValueToObj(global_properties , properties_so);
+    application->load_global_properties(properties_so);
+    MessageHelper::SendGlobalPropertiesToHMI(application);
+  }
+}
+
+void ResumeCtrl::AddSubscriptions(ApplicationSharedPtr application, const Json::Value& saved_app) {
+  if (saved_app.isMember(strings::application_subscribtions)) {
+    const Json::Value& subscribtions = saved_app[strings::application_subscribtions];
+
+    if (subscribtions.isMember(strings::application_buttons)) {
+      const Json::Value& subscribtions_buttons = subscribtions[strings::application_buttons];
+      mobile_apis::ButtonName::eType btn;
+      for (Json::Value::iterator json_it = subscribtions_buttons.begin();
+           json_it != subscribtions_buttons.end(); ++json_it) {
+        btn = static_cast<mobile_apis::ButtonName::eType>((*json_it).asInt());
+        application->SubscribeToButton(btn);
+      }
+    }
+    if (subscribtions.isMember(strings::application_vehicle_info)) {
+      const Json::Value& subscribtions_ivi= subscribtions[strings::application_vehicle_info];
+      VehicleDataType ivi;
+      for (Json::Value::iterator json_it = subscribtions_ivi.begin();
+           json_it != subscribtions_ivi.end(); ++json_it) {
+        ivi = static_cast<VehicleDataType>((*json_it).asInt());
+        application->SubscribeToIVI(ivi);
+      }
+    }
+
+    ProcessHMIRequests(MessageHelper::GetIVISubscriptionRequests(application));
+  }
+}
+
+void ResumeCtrl::ProcessHMIRequests(const MessageHelper::SmartObjectList& requests) {
+  for (MessageHelper::SmartObjectList::const_iterator it = requests.begin(),
+       total = requests.end();
+       it != total; ++it) {
+    ProcessHMIRequest(*it, true);
+  }
+}
+
+bool ResumeCtrl::CheckIcons(ApplicationSharedPtr application,
+                            const Json::Value& json_object) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  bool result = true;
+  if (!json_object.isNull()) {
+    Json::Value::const_iterator json_it = json_object.begin();
+    for (;json_it != json_object.end() && result; ++json_it) {
+      const Json::Value& json_command = *json_it;
+      if (!json_command.isNull()) {
+        smart_objects::SmartObject message(smart_objects::SmartType::SmartType_Map);
+        Formatters::CFormatterJsonBase::jsonValueToObj(json_command, message);
+
+        result = (mobile_apis::Result::INVALID_DATA ==
+            MessageHelper::VerifyImageFiles(message, application));
+      } else {
+        LOG4CXX_WARN(logger_, "Invalid json object");
+      }
+    }
+  } else {
+        LOG4CXX_WARN(logger_, "Passed json object is null");
+  }
+  return result;
+}
+
+Json::Value& ResumeCtrl::GetFromSavedOrAppend(const std::string& mobile_app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  for (Json::Value::iterator it = GetSavedApplications().begin();
+      it != GetSavedApplications().end(); ++it) {
+    if (mobile_app_id == (*it)[strings::app_id].asString()) {
+      return *it;
+    }
+  }
+
+  return GetSavedApplications().append(Json::Value());
+}
+
+int ResumeCtrl::GetObjectIndex(const std::string& mobile_app_id) {
+
+  const Json::Value& apps = GetSavedApplications();
+
+  const Json::ArrayIndex size = apps.size();
+  Json::ArrayIndex idx = apps.size();
+  for (; idx != size; ++idx) {
+    if (mobile_app_id == apps[idx][strings::app_id].asString()) {
+      return idx;
+    }
+  }
+  return -1;
+}
+
 void ResumeCtrl::SendHMIRequest(
     const hmi_apis::FunctionID::eType& function_id,
     const smart_objects::SmartObject* msg_params, bool use_events) {
-
+  LOG4CXX_AUTO_TRACE(logger_);
   NsSmartDeviceLink::NsSmartObjects::SmartObject* result =
       MessageHelper::CreateModuleInfoSO(function_id);
   int32_t hmi_correlation_id =
diff --git a/src/components/application_manager/src/usage_statistics.cc b/src/components/application_manager/src/usage_statistics.cc
index 44ab164538..ad986d2223 100644
--- a/src/components/application_manager/src/usage_statistics.cc
+++ b/src/components/application_manager/src/usage_statistics.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt
index 4d0e7a738f..73f9421732 100644
--- a/src/components/application_manager/test/CMakeLists.txt
+++ b/src/components/application_manager/test/CMakeLists.txt
@@ -10,6 +10,7 @@ set_property(DIRECTORY "" PROPERTY INCLUDE_DIRECTORIES ${the_include_dirs})
 include_directories (
   ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/include
   ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/gtest/include
+  ${COMPONENTS_DIR}/application_manager/include/application_manager/policies
 )
 
 set(testSources
@@ -47,10 +48,6 @@ set (AM_SOURCES
   include_directories(
     ${AM_SOURCE_DIR}/policy/src/policy/policy_table/table_struct
   )
-  list(APPEND AM_SOURCES
-    ${COMPONENTS_DIR}/application_manager/src/policies/pt_exchange_handler_impl.cc
-    ${COMPONENTS_DIR}/application_manager/src/policies/policy_retry_sequence.cc
-  )
 
 set(testLibraries
   gmock
diff --git a/src/components/application_manager/test/mock/include/application_manager/application.h b/src/components/application_manager/test/mock/include/application_manager/application.h
index 5f1f598851..4e56bfec94 100644
--- a/src/components/application_manager/test/mock/include/application_manager/application.h
+++ b/src/components/application_manager/test/mock/include/application_manager/application.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -36,6 +36,7 @@
 #include <string>
 #include <map>
 #include "utils/shared_ptr.h"
+#include "utils/data_accessor.h"
 #include "interfaces/MOBILE_API.h"
 #include "connection_handler/device.h"
 #include "application_manager/message.h"
@@ -164,6 +165,7 @@ class DynamicApplicationData {
     virtual const smart_objects::SmartObject* menu_title() const = 0;
     virtual const smart_objects::SmartObject* menu_icon() const = 0;
 
+    virtual void load_global_properties(const smart_objects::SmartObject& so) = 0;
     virtual void set_help_prompt(
       const smart_objects::SmartObject& help_prompt) = 0;
     virtual void set_timeout_prompt(
@@ -268,7 +270,7 @@ class DynamicApplicationData {
      *
      * @return ChoiceSet map that is currently in use
      */
-    virtual const PerformChoiceSetMap&
+    virtual DataAccessor<PerformChoiceSetMap>
     performinteraction_choice_set_map() const = 0;
 
     /*
@@ -285,17 +287,17 @@ class DynamicApplicationData {
     /*
      * @brief Retrieve application commands
      */
-    virtual const CommandsMap& commands_map() const = 0;
+    virtual DataAccessor<CommandsMap> commands_map() const = 0;
 
     /*
      * @brief Retrieve application sub menus
      */
-    virtual const SubMenuMap& sub_menu_map() const = 0;
+    virtual DataAccessor<SubMenuMap> sub_menu_map() const = 0;
 
     /*
      * @brief Retrieve application choice set map
      */
-    virtual const ChoiceSetMap& choice_set_map() const = 0;
+    virtual DataAccessor<ChoiceSetMap> choice_set_map() const = 0;
 
     /*
      * @brief Sets perform interaction state
@@ -391,6 +393,7 @@ class Application : public virtual InitialApplicationData,
     virtual void CloseActiveMessage() = 0;
     virtual bool IsFullscreen() const = 0;
     virtual bool MakeFullscreen() = 0;
+    virtual void ChangeSupportingAppHMIType() = 0;
     virtual bool IsAudible() const = 0;
     virtual void MakeNotAudible() = 0;
     virtual bool allowed_support_navigation() const = 0;
diff --git a/src/components/application_manager/test/mock/include/application_manager/application_data_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_data_impl.h
index 556eee4349..494cfb1bce 100644
--- a/src/components/application_manager/test/mock/include/application_manager/application_data_impl.h
+++ b/src/components/application_manager/test/mock/include/application_manager/application_data_impl.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_DATA_IMPL_H_
 
 #include <string>
+#include "utils/lock.h"
 #include "smart_objects/smart_object.h"
 #include "application_manager/application.h"
 #include "interfaces/MOBILE_API.h"
@@ -89,6 +90,7 @@ class DynamicApplicationDataImpl : public virtual Application {
     const smart_objects::SmartObject* menu_title() const;
     const smart_objects::SmartObject* menu_icon() const;
 
+    void load_global_properties(const smart_objects::SmartObject& properties_so);
     void set_help_prompt(const smart_objects::SmartObject& help_prompt);
     void set_timeout_prompt(const smart_objects::SmartObject& timeout_prompt);
     void set_vr_help_title(const smart_objects::SmartObject& vr_help_title);
@@ -180,7 +182,7 @@ class DynamicApplicationDataImpl : public virtual Application {
      *
      * @return ChoiceSet map that is currently in use
      */
-    inline const PerformChoiceSetMap& performinteraction_choice_set_map() const;
+    inline DataAccessor<PerformChoiceSetMap> performinteraction_choice_set_map() const;
 
     /*
      * @brief Retrieves choice set that is currently in use by perform
@@ -196,17 +198,17 @@ class DynamicApplicationDataImpl : public virtual Application {
     /*
      * @brief Retrieve application commands
      */
-    inline const CommandsMap& commands_map() const;
+    inline DataAccessor<CommandsMap> commands_map() const;
 
     /*
      * @brief Retrieve application sub menus
      */
-    inline const SubMenuMap& sub_menu_map() const;
+    inline DataAccessor<SubMenuMap> sub_menu_map() const;
 
     /*
      * @brief Retrieve application choice set map
      */
-    inline const ChoiceSetMap& choice_set_map() const;
+    inline DataAccessor<ChoiceSetMap> choice_set_map() const;
 
     /*
      * @brief Sets perform interaction state
@@ -279,27 +281,41 @@ class DynamicApplicationDataImpl : public virtual Application {
 
 
     CommandsMap commands_;
+    mutable sync_primitives::Lock commands_lock_;
     SubMenuMap sub_menu_;
+    mutable sync_primitives::Lock sub_menu_lock_;
     ChoiceSetMap choice_set_map_;
+    mutable sync_primitives::Lock choice_set_map_lock_;
     PerformChoiceSetMap performinteraction_choice_set_map_;
+    mutable sync_primitives::Lock performinteraction_choice_set_lock_;
     uint32_t is_perform_interaction_active_;
     uint32_t perform_interaction_ui_corrid_;
     bool is_reset_global_properties_active_;
     int32_t perform_interaction_mode_;
   private:
+    void SetGlobalProperties(const smart_objects::SmartObject& param,
+                             void (DynamicApplicationData::*callback)(
+                               const NsSmartDeviceLink::NsSmartObjects::SmartObject&));
     DISALLOW_COPY_AND_ASSIGN(DynamicApplicationDataImpl);
 };
 
-const CommandsMap& DynamicApplicationDataImpl::commands_map() const {
-  return commands_;
+DataAccessor<CommandsMap> DynamicApplicationDataImpl::commands_map() const {
+  return DataAccessor<CommandsMap>(commands_, commands_lock_);
 }
 
-const SubMenuMap& DynamicApplicationDataImpl::sub_menu_map() const {
-  return sub_menu_;
+DataAccessor<SubMenuMap> DynamicApplicationDataImpl::sub_menu_map() const {
+  return DataAccessor<SubMenuMap>(sub_menu_, sub_menu_lock_);
 }
 
-const ChoiceSetMap& DynamicApplicationDataImpl::choice_set_map() const {
-  return choice_set_map_;
+DataAccessor<ChoiceSetMap> DynamicApplicationDataImpl::choice_set_map() const {
+  return DataAccessor<ChoiceSetMap>(choice_set_map_, choice_set_map_lock_);
+}
+
+DataAccessor<PerformChoiceSetMap>
+DynamicApplicationDataImpl::performinteraction_choice_set_map() const {
+  return DataAccessor<PerformChoiceSetMap>(
+           performinteraction_choice_set_map_,
+           performinteraction_choice_set_lock_);
 }
 
 uint32_t DynamicApplicationDataImpl::is_perform_interaction_active() const {
@@ -314,11 +330,6 @@ bool DynamicApplicationDataImpl::is_reset_global_properties_active() const {
   return is_reset_global_properties_active_;
 }
 
-const PerformChoiceSetMap&
-DynamicApplicationDataImpl::performinteraction_choice_set_map() const {
-  return performinteraction_choice_set_map_;
-}
-
 inline int32_t DynamicApplicationDataImpl::perform_interaction_mode() const {
   return perform_interaction_mode_;
 }
diff --git a/src/components/application_manager/test/mock/include/application_manager/application_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_impl.h
index dadfce0929..fda0837d6b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/application_impl.h
+++ b/src/components/application_manager/test/mock/include/application_manager/application_impl.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -71,6 +71,11 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   void CloseActiveMessage();
   bool IsFullscreen() const;
   bool MakeFullscreen();
+
+  /**
+   * @brief change supporting COMMUNICATION NAVIGATION
+   */
+  virtual void ChangeSupportingAppHMIType();
   bool IsAudible() const;
   void MakeNotAudible();
 
@@ -151,7 +156,6 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
 
   virtual uint32_t nextHash();
   virtual uint32_t curHash() const;
-
   /**
    * @brief Change Hash for current application
    * and send notification to mobile
@@ -231,7 +235,6 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   UsageStatistics                          usage_report_;
   ProtocolVersion                          protocol_version_;
   bool                                     is_voice_communication_application_;
-
   // NAVI retry stream
   volatile bool                            is_video_stream_retry_active_;
   volatile bool                            is_audio_stream_retry_active_;
diff --git a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h
index 85048477a5..1e0b95ddfc 100644
--- a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h
@@ -133,6 +133,13 @@ typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageToMobile> > To
 typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageFromHmi> > FromHmiQueue;
 typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageToHmi> > ToHmiQueue;
 
+// AudioPassThru
+typedef struct  {
+std::vector<uint8_t> binary_data;
+int32_t              session_key;
+} AudioData;
+typedef std::queue<AudioData>                          RawAudioDataQueue;
+typedef threads::MessageLoopThread<RawAudioDataQueue>  AudioPassThruQueue;
 }
 typedef std::vector<std::string> RPCParams;
 
@@ -142,6 +149,7 @@ class ApplicationManagerImpl : public ApplicationManager,
   public connection_handler::ConnectionHandlerObserver,
   public impl::FromMobileQueue::Handler, public impl::ToMobileQueue::Handler,
   public impl::FromHmiQueue::Handler, public impl::ToHmiQueue::Handler,
+  public impl::AudioPassThruQueue::Handler,
   public utils::Singleton<ApplicationManagerImpl> {
 
     friend class ResumeCtrl;
@@ -166,10 +174,12 @@ class ApplicationManagerImpl : public ApplicationManager,
                                             const protocol_handler::ServiceType&));
   MOCK_METHOD2(OnServiceEndedCallback, void (const int32_t&,
                                              const protocol_handler::ServiceType&));
+  MOCK_METHOD1(OnApplicationFloodCallBack, void(const uint32_t&));
   MOCK_METHOD1(Handle, void (const impl::MessageFromMobile));
   MOCK_METHOD1(Handle, void (const impl::MessageToMobile));
   MOCK_METHOD1(Handle, void (const impl::MessageFromHmi));
   MOCK_METHOD1(Handle, void (const impl::MessageToHmi));
+  MOCK_METHOD1(Handle, void (const impl::AudioData));
 
   //ApplicationManager methods
   MOCK_METHOD1(set_hmi_message_handler, void (hmi_message_handler::HMIMessageHandler*));
@@ -177,8 +187,9 @@ class ApplicationManagerImpl : public ApplicationManager,
   MOCK_METHOD1(set_connection_handler, void (connection_handler::ConnectionHandler*));
 
   //ApplicationManagerImpl methods:
-
+#ifdef TIME_TESTER
   MOCK_METHOD1(SetTimeMetricObserver, void(AMMetricObserver*));
+#endif
   MOCK_METHOD1(RegisterApplication,
                 ApplicationSharedPtr(const utils::SharedPtr<smart_objects::SmartObject>&));
   MOCK_METHOD0(hmi_capabilities, HMICapabilities& ());
@@ -193,7 +204,6 @@ class ApplicationManagerImpl : public ApplicationManager,
   MOCK_METHOD1(application_by_policy_id, ApplicationSharedPtr (const std::string&));
   MOCK_METHOD1(RemoveAppDataFromHMI, bool(ApplicationSharedPtr));
   MOCK_METHOD1(HeadUnitReset, void(mobile_api::AppInterfaceUnregisteredReason::eType));
-  MOCK_METHOD0(HeadUnitSuspend, void());
   MOCK_METHOD1(LoadAppDataToHMI, bool(ApplicationSharedPtr));
   MOCK_METHOD1(ActivateApplication, bool (ApplicationSharedPtr));
   MOCK_METHOD1(PutApplicationInFull, mobile_api::HMILevel::eType (ApplicationSharedPtr));
@@ -238,7 +248,7 @@ class ApplicationManagerImpl : public ApplicationManager,
   MOCK_METHOD1(removeNotification, void(const commands::Command*));
   MOCK_METHOD1(addNotification, void(const CommandSharedPtr ));
   MOCK_METHOD0(StartDevicesDiscovery, void());
-  MOCK_METHOD2(SendAudioPassThroughNotification, void(uint32_t, std::vector<uint8_t>));
+  MOCK_METHOD2(SendAudioPassThroughNotification, void(uint32_t, std::vector<uint8_t>&));
   MOCK_METHOD1(set_all_apps_allowed, void(const bool));
   MOCK_CONST_METHOD0(all_apps_allowed, bool());
   MOCK_METHOD1(set_vr_session_started, void(const bool));
@@ -266,6 +276,9 @@ class ApplicationManagerImpl : public ApplicationManager,
   MOCK_CONST_METHOD1(DoesAudioAppWithSameHMITypeExistInFullOrLimited, bool(ApplicationSharedPtr));
   MOCK_CONST_METHOD0(active_application, ApplicationSharedPtr ());
   MOCK_METHOD0(OnApplicationListUpdateTimer, void());
+  MOCK_METHOD0(OnLowVoltage, void());
+  MOCK_METHOD0(OnWakeUp, void());
+  MOCK_METHOD1(OnUpdateHMIAppType, void(std::map<std::string, std::vector<std::string> >));
 
   typedef const std::set<ApplicationSharedPtr> TAppList;
   typedef std::set<ApplicationSharedPtr>::iterator TAppListIt;
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/command.h b/src/components/application_manager/test/mock/include/application_manager/commands/command.h
index 587c3d834c..65eb8c143c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/command.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/command.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/command_impl.h b/src/components/application_manager/test/mock/include/application_manager/commands/command_impl.h
index a34716bd62..d444298ce7 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/command_impl.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/command_impl.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/command_request_impl.h b/src/components/application_manager/test/mock/include/application_manager/commands/command_request_impl.h
index 1bbba5aa0b..1c33bc4bf0 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/command_request_impl.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/command_request_impl.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_request.h
index 3495ce1377..7d1b294c86 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -52,7 +52,7 @@ class ActivateAppRequest : public RequestToHMI, event_engine::EventObserver {
     explicit ActivateAppRequest(const MessageSharedPtr& message);
 
     /**
-     * @brief Calback for response
+     * @brief Callback for response
      *
      * @param event - event response
      **/
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_response.h
index 1df9bc095a..a15d317077 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/activate_app_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/add_statistics_info_notification.h
index 1569af434d..1aa3b7a512 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/add_statistics_info_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/add_statistics_info_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_request.h
index 6c2db489ce..3d42b6d5a6 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_response.h
index 0eb8184fa8..ccc8d5ae7d 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_all_apps_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_request.h
index 91228440a2..e90576a7df 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_response.h
index 5a24ac1a74..6bedf30a38 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/allow_app_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_request.h
index d066df813e..867596f189 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_response.h
index 1948211c48..5c174eac85 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/basic_communication_system_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_request.h
index 3c9fbac684..639800a047 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_response.h
index 067954537d..7cd174477b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/button_get_capabilities_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_request.h
index 72ff8a2c5b..34722bc4f1 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_response.h
index 05318e3cb9..ce3a6d2936 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/close_popup_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_request.h
index 8cb34718a1..8262dbb6fa 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_response.h
index f10c07c52f..70983d3ce3 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_system_info_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls.h
index 9241446676..551ab20431 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls_response.h
index 6b025142e2..956e5a788e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/get_urls_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_request.h
index 905b5b3836..2957693c9e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_response.h
index c8bfe4e156..e2b5affe34 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/mixing_audio_supported_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_request.h
index 1e2a39df94..58f85f829a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_response.h
index 41e0f623f1..11f46d5da8 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_alert_maneuver_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_audio_start_stream_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_audio_start_stream_request.h
index a321d32dd9..97de7102f7 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_audio_start_stream_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_audio_start_stream_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_request.h
index a31efc7fe4..e779ecb699 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_response.h
index 0fbad35154..3da6933bc3 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_request.h
index 9c91df648a..45474b532a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_response.h
index 029d903192..ef9a605c36 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_send_location_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h
index 5da47e580b..b866ce3e1f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h
index 4a26b26b09..3f212985f9 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_start_stream_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_start_stream_request.h
index f43b992219..5b73e2dbab 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_start_stream_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_start_stream_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_request.h
index 61beef1b3b..a5e2f8bf37 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_response.h
index 9e711b8be9..0e15a9175c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/navi_update_turn_list_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h
index aa549638e4..6ec14e35b0 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_activated_notification.h
index a8bdeb6c91..011df3832c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_activated_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_activated_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_deactivated_notification.h
index 4c56dc4158..8731fc43f1 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_deactivated_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_deactivated_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_changed_notification.h
index 034efb7a8c..c6ea82a15c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_changed_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_changed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_consent_notification.h
index a5037820cc..ea36d55b39 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_consent_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_permission_consent_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_registered_notification.h
index 4364aa9a35..1ebbfcd483 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_registered_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_registered_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_unregistered_notification.h
index d8470af396..96fd19e9bc 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_unregistered_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_app_unregistered_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_event_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_event_notification.h
index a4657ea24e..0a56d7d924 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_event_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_event_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_press_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_press_notification.h
index 065cdc4a72..ce5f1de8f1 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_press_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_button_press_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_chosen_notification.h
index e980bfe41b..17ba26b7f7 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_chosen_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_chosen_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_state_changed_notification.h
index 5c12bdfd9f..b87a6e2d9f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_state_changed_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_device_state_changed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_driver_distraction_notification.h
index 77da5cf3b2..01a87aae05 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_driver_distraction_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_driver_distraction_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_all_applications_notification.h
index c913509e5e..65d78f60c6 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_all_applications_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_all_applications_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_application_notification.h
index b78c0e2afe..479dd3a09c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_application_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_exit_application_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_file_removed_notification.h
index b6b46041f8..cc47705c82 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_file_removed_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_file_removed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_find_applications.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_find_applications.h
index 2499129b2c..f9fb9cdb21 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_find_applications.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_find_applications.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h
index ed0638f3cc..f8fccdc382 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h
index 6e42e1a0cd..a657ffcc68 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_play_tone_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_play_tone_notification.h
index 8e463c3276..ceba0528fa 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_play_tone_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_play_tone_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_policy_update.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_policy_update.h
index f71de540e5..81278fb75a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_policy_update.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_policy_update.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_put_file_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_put_file_notification.h
index 839af785be..bc60284309 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_put_file_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_put_file_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ready_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ready_notification.h
index a3e2dd731d..24fc52deac 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ready_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ready_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_received_policy_update.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_received_policy_update.h
index 38a4470d22..0eeb28218f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_received_policy_update.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_received_policy_update.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_record_start_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_record_start_notification.h
index 81f0b5bdda..67cccdd816 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_record_start_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_record_start_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_resume_audio_source_notification.h
index c27e2e5ee8..03f84d0907 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_resume_audio_source_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_resume_audio_source_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_close_notification.h
index e6b4418d6d..5b9ac04e8f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_close_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_close_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h
index c9b93a4dcf..4f30873e4e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h
index 5da06ef34c..6f8f3a6e1a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_start_device_discovery.h
index 3e4dc1daf4..bfa14f67fc 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_start_device_discovery.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_start_device_discovery.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_status_update_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_status_update_notification.h
index ae85d13713..c123826886 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_status_update_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_status_update_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_context_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_context_notification.h
index b16df6069e..35d6f49daa 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_context_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_context_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_error_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_error_notification.h
index cb3fc12017..ee7df7acd6 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_error_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_error_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_info_changed_notification.h
index d0bcadfaac..9b6c62782c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_info_changed_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_info_changed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_request_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_request_notification.h
index 6e3a0eea7f..f1d25e24a4 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_request_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_system_request_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_language_change_notification.h
index d9b55ac0c1..79ae9b496e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_language_change_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_language_change_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h
index 3bafc920b7..11cb755544 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_started_notification.h
index 8cb6256074..c7e88ac558 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_started_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_started_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_stopped_notification.h
index 31fb6fb31c..bf5dc7fb9e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_stopped_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_tts_stopped_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_command_notification.h
index 1d0aaf3078..b4a0228c78 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_command_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_command_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h
index bb0a6a72d3..77b771065b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_language_change_notification.h
index 85b8f60c4d..bcb661c89d 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_language_change_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_language_change_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h
index 511606d077..f97c8768b5 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_touch_event_notification.h
index 3231d1ca29..6d8005e12f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_touch_event_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_ui_touch_event_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_update_device_list.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_update_device_list.h
index c0d355c925..f56d01a5cc 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_update_device_list.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_update_device_list.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h
index 04bb3e54bc..d591ab2be6 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_belt_status_notification.h
index 3cfb048cdc..f901462fdf 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_belt_status_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_belt_status_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_body_information_notification.h
index b9ecf5a34b..a0bc31778a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_body_information_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_body_information_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_device_status_notification.h
index 925989e8c6..0e24616f3e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_device_status_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_device_status_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h
index 7baea90651..0290388756 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h
index 33dd824c6e..8307e5359e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h
index 207302a373..be5b086853 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h
index 535758db25..83e6f845e0 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h
index 92dffd89b3..42a6b8e0d9 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_gps_data_notification.h
index d8f2a768fc..01c2cf60b6 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_gps_data_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_gps_data_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h
index 47802e97eb..dc80b33ddd 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h
index fe38412980..c4e5accead 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_my_key_notification.h
index d636b6e779..e2d9d91ae1 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_my_key_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_my_key_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_odometer_notification.h
index 1cf4c25878..7c1c691ac5 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_odometer_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_odometer_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_prndl_notification.h
index 5a3a136374..bf2ca83f8f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_prndl_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_prndl_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_rpm_notification.h
index 80dea2a6e2..ebcfe3a86c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_rpm_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_rpm_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_speed_notification.h
index 19bffabf4f..37bf66e4d0 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_speed_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_speed_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h
index 0826cb6c6f..bf01b2bf76 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h
index ba8eceefc3..1c1e00d893 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h
index 30ad9d6acc..59da271a04 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vin_notification.h
index 0cb5fb17d2..06b73c508d 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vin_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_vin_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h
index c7a1a6bd62..399b38112e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_command_notification.h
index 677bc26727..37bc2556f8 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_command_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_command_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_language_change_notification.h
index 24c60c32d9..be408f0aa0 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_language_change_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_language_change_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_started_notification.h
index cc78f010b6..5ae5ace27b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_started_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_started_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_stopped_notification.h
index 2ee8ad429e..311ee8acde 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_stopped_notification.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/on_vr_stopped_notification.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_from_hmi.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_from_hmi.h
index 39ebd95819..b9b3ec3597 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_from_hmi.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_from_hmi.h
@@ -1,4 +1,4 @@
-  /**
+  /*
    Copyright (c) 2014, Ford Motor Company
    All rights reserved.
 
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_to_hmi.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_to_hmi.h
index 3a9de4b7b5..fe359182dd 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_to_hmi.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/request_to_hmi.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/response_from_hmi.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/response_from_hmi.h
index 21497a1335..c888807e96 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/response_from_hmi.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/response_from_hmi.h
@@ -1,4 +1,4 @@
-/**
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_request.h
index db4a93b0b5..2505b39acc 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_response.h
index 63adc6c0d3..bf0789e60e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_activate_app_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h
index 5da473b1a7..7c8f10529b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h
index 5de9fc0ea8..452784d92c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_request.h
index a098e0a113..cb7d37d336 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_response.h
index 6299cde630..a3fc0862b5 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_status_update_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h
index b729a16170..96f46cfa3d 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h
index bb7a7f8e20..4cf7be56c9 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update.h
index ee2b9865c8..481f37a257 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update_response.h
index b6ab925fd6..d3f7105523 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/sdl_policy_update_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_request.h
index a587af950b..a25309e5d5 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_response.h
index 3a9e9fda51..73ad180286 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_change_registration_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_request.h
index 73edd9de73..543945e8ef 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_response.h
index 71f85d68e3..2fc16d1a40 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_capabilities_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_request.h
index 94e38ec473..e0ae0da0c4 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_response.h
index bd67d64f32..0d9df07ae6 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_language_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_request.h
index ff80dd2389..136edbb5f4 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_response.h
index 244f223460..38e3c673bb 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_get_supported_languages_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_request.h
index dc58d852ea..676faabc01 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_response.h
index 375e5a5d1f..12bb3bb870 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_request.h
index b398e0b2d2..92a260d77f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_response.h
index adf0b70276..0766decf9f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_set_global_properties_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_request.h
index 326c638f4d..f5555f6495 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_response.h
index e22c549871..541ea0d2ab 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_speak_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_request.h
index 0d82121fd7..46c464425d 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_response.h
index b9055bfbe5..aab8ca8c5b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/tts_stop_speaking_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_request.h
index ffd6eeeefd..6b857818e7 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_response.h
index f84b71d0f1..c6a02fdd03 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_command_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_request.h
index 1227de0463..bba9a4c47e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_response.h
index 1b3a10729e..0c4afc2fa3 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_add_submenu_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_request.h
index 7395eb19e1..72cd733eb5 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_response.h
index 1d17d98095..97eb2ba94b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_alert_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_request.h
index 51276b7b0f..8e68dee2ec 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_response.h
index edb7574e8d..50b092639b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_change_registration_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_request.h
index 398f78c28f..9eceb2eb6f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_response.h
index bb19811908..c4d7ab6cac 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_command_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_request.h
index 1b3747234b..24bf5878ff 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_response.h
index 8bbab99468..05d77c82d7 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_delete_submenu_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h
index 9e8e11c1ad..06637fc8d4 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h
index 740fc5501d..6d5594f69f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_request.h
index 2d0469d6a6..ad9a566078 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_response.h
index dc6052e049..ce6ad6f7ef 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_capabilities_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_request.h
index 4fca4826be..7371cd1031 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_response.h
index ea43e3856d..f6536452ce 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_language_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_request.h
index cc0e70feae..d0975e68da 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_response.h
index 15e400687f..c888c7b208 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_get_supported_languages_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_request.h
index 5e2cb7ef9f..7cb4287244 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_response.h
index bc7210f2a8..64106654e9 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h
index 94bc4827a9..69566324f2 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h
index 04afedfba0..c3283101f9 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_request.h
index 0d63139437..d8e2f6c682 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_response.h
index 32a87c73c2..04286897a3 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_perform_interaction_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_request.h
index 6f23d3b21c..06bfadbae7 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_response.h
index 7bf15a0511..6d6d09c313 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_scrollable_message_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_display_layout_response.h
index 74df2030e5..3e7a898af0 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_display_layout_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_display_layout_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_request.h
index f3f7d0e733..8b54e85332 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_response.h
index bc00397e37..b3cb38d49f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_global_properties_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_request.h
index 1541aada6b..f78772a8a3 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_response.h
index f125f64282..288bcc94d2 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_icon_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h
index 44cbbbfcf9..443fc8d1a7 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h
index dd46f128d9..9358707117 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_request.h
index 6f22263e61..136a99622b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_response.h
index a6391fa6c9..4a9b49253e 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_show_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_request.h
index 5cb31b4a95..8a3b37bfef 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_response.h
index aae5408e21..2384f248aa 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/ui_slider_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_request.h
index d2307232e3..b606134409 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_response.h
index 3e6a1d78a2..135481cb0b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_app_list_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_request.h
index e9a32e9fc4..f645d312c5 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_response.h
index d4191c8bee..6ea2c1e528 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_device_list_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_request.h
index 506c137861..f84f93f2ed 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_response.h
index 729483cfa1..b0d370ecfd 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/update_sdl_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_request.h
index 90e1e145c2..c60533d2ea 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_response.h
index f332a32812..027e007e42 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_diagnostic_message_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_request.h
index 93f046d7d6..170eb895fd 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_response.h
index 9ee7fac44a..3ba4656d5b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_dtcs_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h
index 9cb964981c..7413b6bf3b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h
index 951bf0c334..af991186fd 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h
index 952b0fb4d3..1f9736b56a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h
index ecd465365a..156664cac3 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h
index 876f7d2e55..67d8ae046c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h
index 8b632182f0..b36b193418 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_request.h
index e905cf4c09..061681029a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_response.h
index e13e368b34..52e00f85da 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_request.h
index 336ad4443a..6520db5e7d 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_response.h
index af66505174..0855be454b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_read_did_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h
index ef14a05f2d..1eb06c6217 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h
index bcfa2f6f1a..fc9b7dd2ea 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h
index 057fd52e13..b5e2788f32 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h
index 740d8c386a..64f3c51cbc 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h
index 18d118fadb..1320ae477a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
index d604d4d536..9aa529d407 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h
index b71b8241f5..8818709afe 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
index 8730cc0361..3dfcc763cb 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_request.h
index 3675cfb153..9fdc3f776f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_response.h
index 328e8a2058..7418ed5865 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_add_command_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_request.h
index 5e69b4c18b..53584ee970 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_response.h
index f79da44598..d71a14da34 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_change_registration_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_request.h
index b843f498f8..91a5dc7d99 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_response.h
index 11a681bd5e..ad8c82e38c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_delete_command_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_request.h
index 7771bdd141..676967083f 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_response.h
index ced60c9d65..8b88eb4e3b 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_capabilities_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_request.h
index 955355d06c..9dd9133ffd 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_response.h
index 2bd59b8be2..d9c4fc2126 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_language_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_request.h
index 79105978b0..0a010cdfec 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_response.h
index 38f5056225..dbbe57ba36 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_get_supported_languages_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_request.h
index ac734638b1..e66c9c36a5 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_response.h
index 4f4f86d84c..a9b1a68455 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_is_ready_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_request.h
index b71b31baf5..b819fdb927 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_request.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_response.h
index fbf5b87cb6..ffbbd613e2 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/hmi/vr_perform_interaction_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/change_registration_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/change_registration_request.h
index 3de3e8fc2f..d36f16a976 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/change_registration_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/change_registration_request.h
@@ -105,9 +105,9 @@ class ChangeRegistrationRequest : public CommandRequestImpl  {
   /*
    * @brief Checks result codes
    *
-   * @return true if one of result codes is success
+   * @return true if all of result codes is success
    */
-  static bool WasAnySuccess(const hmi_apis::Common_Result::eType ui,
+   bool AllHmiResponsesSuccess(const hmi_apis::Common_Result::eType ui,
                      const hmi_apis::Common_Result::eType vr,
                      const hmi_apis::Common_Result::eType tts);
 
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/generic_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/generic_response.h
index c3b39bf917..1fb931d508 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/generic_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/generic_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/register_app_interface_request.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/register_app_interface_request.h
index 9c1d46368f..14b51777dd 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/register_app_interface_request.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/register_app_interface_request.h
@@ -99,23 +99,6 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl {
   bool IsApplicationWithSameAppIdRegistered();
 
   /*
-   * @brief Check for some request param. names restrictions, e.g. for
-   * newline characters
-   *
-   * return SUCCESS if param name pass the check, otherwise - error code
-   * will be returned
-   */
-  mobile_apis::Result::eType CheckRestrictions() const;
-
-  /*
-   * @brief Removes hidden symbols and spaces
-   *
-   * return cleared copy of param name
-   */
-  std::string ClearParamName(std::string param_name) const;
-
-
-  /*
    * @brief Check new application parameters (name, tts, vr) for
    * coincidence with already known parameters of registered applications
    *
@@ -163,6 +146,8 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl {
   bool IsWhiteSpaceExist();
 
   std::string response_info_;
+  mobile_apis::Result::eType result_checking_app_hmi_type_;
+
 
   DISALLOW_COPY_AND_ASSIGN(RegisterAppInterfaceRequest);
 };
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/scrollable_message_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/scrollable_message_response.h
index 36fd311ad6..f0c0ea8f7a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/scrollable_message_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/scrollable_message_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/send_location_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/send_location_response.h
index 6e18aa5f27..fe88a2af29 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/send_location_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/send_location_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/set_media_clock_timer_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/set_media_clock_timer_response.h
index e835c17c80..46844bd2f3 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/set_media_clock_timer_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/set_media_clock_timer_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/show_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/show_response.h
index 970b54747e..c327bc3b3a 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/show_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/show_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/slider_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/slider_response.h
index b7821adca2..1888388e7c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/slider_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/slider_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/speak_response.h b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/speak_response.h
index ef9b8f89d3..cbf1ec40de 100644
--- a/src/components/application_manager/test/mock/include/application_manager/commands/mobile/speak_response.h
+++ b/src/components/application_manager/test/mock/include/application_manager/commands/mobile/speak_response.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/hmi_capabilities.h b/src/components/application_manager/test/mock/include/application_manager/hmi_capabilities.h
index 20a849baee..000242daf0 100644
--- a/src/components/application_manager/test/mock/include/application_manager/hmi_capabilities.h
+++ b/src/components/application_manager/test/mock/include/application_manager/hmi_capabilities.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/message.h b/src/components/application_manager/test/mock/include/application_manager/message.h
index d92c89adf1..eec6795d7c 100644
--- a/src/components/application_manager/test/mock/include/application_manager/message.h
+++ b/src/components/application_manager/test/mock/include/application_manager/message.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/message_helper.h b/src/components/application_manager/test/mock/include/application_manager/message_helper.h
index 69c7b7bba7..a4d1fa9f79 100644
--- a/src/components/application_manager/test/mock/include/application_manager/message_helper.h
+++ b/src/components/application_manager/test/mock/include/application_manager/message_helper.h
@@ -178,7 +178,7 @@ class MessageHelper {
     /**
      * @brief Sends IVI subscriptions
      */
-    static SmartObjectList GetIVISubscribtionRequests(const uint32_t app_id);
+    static SmartObjectList GetIVISubscriptionRequests(ApplicationSharedPtr app);
 
     static void SendAppDataToHMI(ApplicationConstSharedPtr app);
     static void SendGlobalPropertiesToHMI(ApplicationConstSharedPtr app);
@@ -192,6 +192,11 @@ class MessageHelper {
     static void SendAddCommandRequestToHMI(ApplicationConstSharedPtr app);
     static SmartObjectList CreateAddCommandRequestToHMI(ApplicationConstSharedPtr app);
 
+    /**
+     * @brief Sends UI_ChangeRegistration to HMI with list of AppHMIType
+     * @param app applicaton instace
+     */
+    static void SendUIChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app);
     static void SendChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app);
     static void SendAddVRCommandToHMI(
       uint32_t cmd_id, const smart_objects::SmartObject& vr_commands,
@@ -223,7 +228,8 @@ class MessageHelper {
                                                 bool is_unexpected_disconnect = false);
     static void SendActivateAppToHMI(
       uint32_t const app_id,
-      hmi_apis::Common_HMILevel::eType level = hmi_apis::Common_HMILevel::FULL);
+      hmi_apis::Common_HMILevel::eType level = hmi_apis::Common_HMILevel::FULL,
+      bool send_policy_priority = true);
 
     static void SendOnResumeAudioSourceToHMI(const uint32_t app_id);
 
@@ -421,6 +427,16 @@ class MessageHelper {
       smart_objects::SmartObject& message_params,
       ApplicationConstSharedPtr app);
 
+    /**
+     * @brief checkWithPolicy allows to check soft button's parameters
+     * according to the current policy
+     * @param system_action system action
+     * @param app_mobile_id policy application id
+     * @return
+     */
+    static bool CheckWithPolicy(int system_action,
+                                const std::string& app_mobile_id);
+
     /*
      * @brief subscribe application to softbutton
      *
@@ -481,7 +497,8 @@ class MessageHelper {
                                    smart_objects::SmartObject& message);
 
     static smart_objects::SmartObject* CreateChangeRegistration(
-      int32_t function_id, int32_t language, uint32_t app_id);
+      int32_t function_id, int32_t language, uint32_t app_id,
+      const smart_objects::SmartObject* app_types = NULL);
 
     MessageHelper();
 
diff --git a/src/components/application_manager/test/mock/include/application_manager/policies/delegates/app_permission_delegate.h b/src/components/application_manager/test/mock/include/application_manager/policies/delegates/app_permission_delegate.h
new file mode 100644
index 0000000000..55a4f146c2
--- /dev/null
+++ b/src/components/application_manager/test/mock/include/application_manager/policies/delegates/app_permission_delegate.h
@@ -0,0 +1,81 @@
+/*
+ Copyright (c) 2014, Ford Motor Company
+ 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 Ford Motor Company 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 HOLDER 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.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_
+
+
+#include "utils/threads/thread.h"
+#include "utils/threads/thread_delegate.h"
+#include "utils/conditional_variable.h"
+
+#include "policy/policy_types.h"
+
+namespace policy {
+
+  /**
+ * @brief The AppPermissionDelegate class allows to call OnAppPermissionConsent
+ * in async way.
+ */
+class AppPermissionDelegate: public threads::ThreadDelegate {
+  public:
+    /**
+     * @brief AppPermissionDelegate constructor, contains parameters
+     * which will be pass to the called function.
+     *
+     * @param connection_key connection key.
+     *
+     * @param permissions new permissions
+     */
+    AppPermissionDelegate(const uint32_t connection_key,
+                          const PermissionConsent &permissions);
+
+    /**
+     * @brief threadMain run the needed function.
+     */
+    virtual void threadMain();
+
+    /**
+     * @brief exitThreadMain do some stuff before exit from thread
+     *
+     * @return true in case when thread has been finished properly
+     */
+    virtual void exitThreadMain();
+
+  private:
+    uint32_t connection_key_;
+    PermissionConsent permissions_;
+};
+
+} // namespace policy
+
+#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_
diff --git a/src/components/application_manager/test/mock/include/application_manager/policies/delegates/statistics_delegate.h b/src/components/application_manager/test/mock/include/application_manager/policies/delegates/statistics_delegate.h
new file mode 100644
index 0000000000..9044a3fd33
--- /dev/null
+++ b/src/components/application_manager/test/mock/include/application_manager/policies/delegates/statistics_delegate.h
@@ -0,0 +1,82 @@
+/*
+ Copyright (c) 2014, Ford Motor Company
+ 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 Ford Motor Company 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 HOLDER 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.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_STATISTICS_DELEGATE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_STATISTICS_DELEGATE_H_
+
+#include <string>
+
+#include "utils/threads/thread.h"
+#include "utils/threads/thread_delegate.h"
+#include "utils/conditional_variable.h"
+#include "application_manager/usage_statistics.h"
+
+namespace policy {
+
+  class StatisticsDelegate: public threads::ThreadDelegate {
+      enum StatisticType{
+        INCREMENT_GLOBAL,
+        INCREMENT_APP,
+        SET,
+        ADD
+      };
+    public:
+      explicit StatisticsDelegate(usage_statistics::GlobalCounterId type);
+
+      StatisticsDelegate(const std::string& app_id,
+                        usage_statistics::AppCounterId type);
+
+      StatisticsDelegate(const std::string& app_id,
+                        usage_statistics::AppInfoId type,
+                        const std::string& value);
+
+      StatisticsDelegate(const std::string& app_id,
+                        usage_statistics::AppStopwatchId type,
+                        int32_t timespan_seconds);
+
+      virtual void threadMain();
+
+      virtual void exitThreadMain();
+    private:
+      StatisticType type_;
+      usage_statistics::GlobalCounterId global_counter_;
+      usage_statistics::AppCounterId app_counter_;
+      usage_statistics::AppInfoId app_info_;
+      usage_statistics::AppStopwatchId stop_watch_;
+
+      std::string app_id_;
+      std::string value_;
+      int32_t timespan_seconds_;
+  };
+} // namespace policy
+
+#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_STATISTICS_DELEGATE_H_
diff --git a/src/components/application_manager/test/mock/include/application_manager/policies/policy_event_observer.h b/src/components/application_manager/test/mock/include/application_manager/policies/policy_event_observer.h
index 7fdfb4e0ac..e251170fec 100644
--- a/src/components/application_manager/test/mock/include/application_manager/policies/policy_event_observer.h
+++ b/src/components/application_manager/test/mock/include/application_manager/policies/policy_event_observer.h
@@ -34,26 +34,26 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_EVENT_OBSERVER_H_
 
 #include "application_manager/event_engine/event_observer.h"
-#include "utils/shared_ptr.h"
 
 namespace policy {
 namespace smart_objects = NsSmartDeviceLink::NsSmartObjects;
 
-class PolicyManager;
+class PolicyHandler;
 
 class PolicyEventObserver :
     public application_manager::event_engine::EventObserver {
  public:
-  PolicyEventObserver(utils::SharedPtr<PolicyManager> policy_manager);
+  explicit PolicyEventObserver(policy::PolicyHandler* const policy_handler);
+  void set_policy_handler(policy::PolicyHandler* const policy_handler);
   void on_event(const application_manager::event_engine::Event& event);
   void subscribe_on_event(
       const application_manager::event_engine::Event::EventID& event_id,
       int32_t hmi_correlation_id = 0);
  private:
-  utils::SharedPtr<PolicyManager> policy_manager_;
+  sync_primitives::Lock policy_handler_lock_;
+  PolicyHandler* policy_handler_;
   void ProcessOdometerEvent(const smart_objects::SmartObject& message);
 };
 
 }  //  namespace policy
-
 #endif  //  SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_EVENT_OBSERVER_H_
diff --git a/src/components/application_manager/test/mock/include/application_manager/policies/policy_handler.h b/src/components/application_manager/test/mock/include/application_manager/policies/policy_handler.h
index dfc29fe00a..260f2da060 100644
--- a/src/components/application_manager/test/mock/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/test/mock/include/application_manager/policies/policy_handler.h
@@ -39,10 +39,16 @@
 #include <vector>
 #include "policy/policy_manager.h"
 #include "application_manager/policies/policy_event_observer.h"
-#include "application_manager/policies/pt_exchange_handler.h"
+#include "application_manager/policies/delegates/statistics_delegate.h"
 #include "utils/logger.h"
 #include "utils/singleton.h"
+#include "utils/threads/thread.h"
+#include "utils/threads/thread_delegate.h"
+#include "utils/conditional_variable.h"
+#include "utils/rwlock.h"
 #include "usage_statistics/statistics_manager.h"
+#include "policy_handler_observer.h"
+#include "utils/threads/async_runner.h"
 
 namespace Json {
 class Value;
@@ -54,7 +60,8 @@ typedef std::vector<uint32_t> DeviceHandles;
 
 class PolicyHandler :
     public utils::Singleton<PolicyHandler, utils::deleters::Deleter<PolicyHandler> >,
-    public PolicyListener {
+    public PolicyListener,
+    public threads::AsyncRunner {
  public:
   virtual ~PolicyHandler();
   bool LoadPolicyLibrary();
@@ -62,15 +69,18 @@ class PolicyHandler :
   bool InitPolicyTable();
   bool ResetPolicyTable();
   bool ClearUserConsent();
-  bool SendMessageToSDK(const BinaryMessage& pt_string);
+  bool SendMessageToSDK(const BinaryMessage& pt_string, const std::string& url);
   bool ReceiveMessageFromSDK(const std::string& file,
                              const BinaryMessage& pt_string);
   bool UnloadPolicyLibrary();
-  void OnPTExchangeNeeded();
   void OnPermissionsUpdated(const std::string& policy_app_id,
                             const Permissions& permissions,
                             const HMILevel& default_hmi);
 
+  virtual void OnSnapshotCreated(const BinaryMessage& pt_string,
+                                 const std::vector<int>& retry_delay_seconds,
+                                 int timeout_exchange);
+
   bool GetPriority(const std::string& policy_app_id, std::string* priority);
   void CheckPermissions(const PTString& app_id,
                    const PTString& hmi_level,
@@ -85,13 +95,14 @@ class PolicyHandler :
   bool GetInitialAppData(const std::string& application_id,
                                  StringArray* nicknames = NULL,
                                  StringArray* app_hmi_types = NULL);
-  EndpointUrls GetUpdateUrls(int service_type);
+  void GetUpdateUrls(int service_type, EndpointUrls& end_points);
   void ResetRetrySequence();
   int NextRetryTimeout();
   int TimeoutExchange();
   void OnExceededTimeout();
-  BinaryMessageSptr RequestPTUpdate();
-  const std::vector<int> RetrySequenceDelaysSeconds();
+  void OnSystemReady();
+  void PTUpdatedAt(int kilometers, int days_after_epoch);
+  void set_listener(PolicyHandlerObserver* listener);
 
   utils::SharedPtr<usage_statistics::StatisticsManager> GetStatisticManager();
 
@@ -147,11 +158,6 @@ class PolicyHandler :
   void OnPendingPermissionChange(const std::string& policy_app_id);
 
   /**
-   * Initializes PT exchange at ignition if need
-   */
-  void PTExchangeAtRegistration(const std::string& app_id);
-
-  /**
    * Initializes PT exchange at user request
    * @param correlation_id correlation id of request
    */
@@ -171,7 +177,7 @@ class PolicyHandler :
    * @param permissions User-changed group permissions consent
    */
   void OnAppPermissionConsent(const uint32_t connection_key,
-                              PermissionConsent& permissions);
+                              const PermissionConsent &permissions);
 
   /**
    * @brief Get appropriate message parameters and send them with response
@@ -204,7 +210,7 @@ class PolicyHandler :
    * @brief Send notification to HMI with changed policy update status
    * @param status Current policy update state
    */
-  void OnUpdateStatusChanged(policy::PolicyTableStatus status);
+  void OnUpdateStatusChanged(const std::string& status);
 
   /**
    * @brief Update currently used device id in policies manager for given
@@ -271,11 +277,15 @@ class PolicyHandler :
 
   std::string GetAppName(const std::string& policy_app_id);
 
-  virtual void OnUserRequestedUpdateCheckRequired();
+  virtual void OnUpdateHMIAppType(std::map<std::string, StringArray> app_hmi_types);
 
   virtual void OnDeviceConsentChanged(const std::string& device_id,
                                       bool is_allowed);
 
+  virtual void OnPTExchangeNeeded();
+
+  virtual void GetAvailableApps(std::queue<std::string>& apps);
+
   /**
    * @brief Allows to add new or update existed application during
    * registration process
@@ -314,7 +324,6 @@ class PolicyHandler :
                    usage_statistics::AppStopwatchId type,
                    int32_t timespan_seconds);
 
-
 protected:
 
   /**
@@ -322,72 +331,62 @@ protected:
    */
   void StartNextRetry();
 
-  /**
-   * Initializes PT exchange at odometer if need
-   * @param kilometers value from odometer in kilometers
-   */
-  void PTExchangeAtOdometer(int kilometers);
-
-  /**
-     * Starts proccess updating policy table
-   */
-    void StartPTExchange(bool skip_device_selection = false);
-
  private:
-  /**
-   * @brief Choose device according to app HMI status and user consent for
-   * device
-   * @param device_info Struct with selected device parameters
-   * @return consent status for selected device
-   */
-  DeviceConsent GetDeviceForSending(DeviceParams& device_params);
 
   /**
-   * @brief Convert internal policy update status to appropriate status for HMI
-   * @param status Internal policy update status
-   * @return Converted status for sending to HMI
+   * @brief OnAppPermissionConsentInternal reacts on permission changing
+   *
+   * @param connection_key connection key
+   *
+   * @param permissions new permissions.
    */
-  const std::string ConvertUpdateStatus(policy::PolicyTableStatus status);
-
+  void OnAppPermissionConsentInternal(const uint32_t connection_key,
+                                      PermissionConsent& permissions);
 private:
-
   class StatisticManagerImpl: public usage_statistics::StatisticsManager {
       //TODO(AKutsan) REMOVE THIS UGLY HOTFIX
         virtual void Increment(usage_statistics::GlobalCounterId type) {
-        return PolicyHandler::instance()->Increment(type);
+
+        PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(type));
       }
 
         virtual void Increment(const std::string& app_id,
                                usage_statistics::AppCounterId type) {
-        return PolicyHandler::instance()->Increment(app_id, type);
+
+        PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(app_id,
+                                                                   type));
       }
 
         virtual void Set(const std::string& app_id,
                          usage_statistics::AppInfoId type,
                          const std::string& value) {
-        return PolicyHandler::instance()->Set(app_id, type, value);
+
+        PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(app_id,
+                                                                   type,
+                                                                   value));
       }
 
         virtual void Add(const std::string& app_id,
                          usage_statistics::AppStopwatchId type,
                          int32_t timespan_seconds) {
-        return PolicyHandler::instance()->Add(app_id, type, timespan_seconds);
+
+        PolicyHandler::instance()->AsyncRun(new StatisticsDelegate(
+                                              app_id, type, timespan_seconds));
       }
   };
   //TODO(AKutsan) REMOVE THIS UGLY HOTFIX
 
 
   PolicyHandler();
+  bool SaveSnapshot(const BinaryMessage& pt_string, std::string& snap_path);
   static PolicyHandler* instance_;
   static const std::string kLibrary;
+  mutable sync_primitives::RWLock policy_manager_lock_;
   utils::SharedPtr<PolicyManager> policy_manager_;
   void* dl_handle_;
   AppIds last_used_app_ids_;
-  utils::SharedPtr<PTExchangeHandler> exchange_handler_;
   utils::SharedPtr<PolicyEventObserver> event_observer_;
-  bool on_ignition_check_done_;
   uint32_t last_activated_app_id_;
-  bool registration_in_progress;
 
   /**
    * @brief Contains device handles, which were sent for user consent to HMI
@@ -396,7 +395,7 @@ private:
 
   inline bool CreateManager();
 
-  bool is_user_requested_policy_table_update_;
+  PolicyHandlerObserver* listener_;
 
   /**
    * @brief Application-to-device map is used for getting/setting user consents
@@ -404,9 +403,12 @@ private:
    */
   std::map<std::string, std::string> app_to_device_link_;
 
+  // Lock for app to device list
+  sync_primitives::Lock app_to_device_link_lock_;
 
   utils::SharedPtr<StatisticManagerImpl> statistic_manager_impl_;
 
+  friend class AppPermissionDelegate;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyHandler);
   FRIEND_BASE_SINGLETON_CLASS_WITH_DELETER(PolicyHandler,
diff --git a/src/components/application_manager/test/mock/include/application_manager/request_controller.h b/src/components/application_manager/test/mock/include/application_manager/request_controller.h
index 2bc5f54666..efe6b1c4e8 100644
--- a/src/components/application_manager/test/mock/include/application_manager/request_controller.h
+++ b/src/components/application_manager/test/mock/include/application_manager/request_controller.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
@@ -120,7 +120,7 @@ class RequestController {
     * @return Result code
     *
     */
-    TResult addMobileRequest(const MobileRequestPtr& request,
+    TResult addMobileRequest(const RequestPtr request,
                              const mobile_apis::HMILevel::eType& hmi_level);
 
 
@@ -146,7 +146,7 @@ class RequestController {
     * @param mobile_corellation_id Active mobile request correlation ID
     *
     */
-    void terminateMobileRequest(const uint32_t& mobile_correlation_id);
+    void terminateMobileRequest(const uint32_t& mobile_correlation_id, const uint32_t& connection_key);
 
 
     /**
@@ -177,6 +177,12 @@ class RequestController {
     */
     void terminateAllHMIRequests();
 
+
+    /**
+    * @brief Terminates all requests from Mobile
+    */
+    void terminateAllMobileRequests();
+
     /**
     * @brief Updates request timeout
     *
@@ -188,30 +194,50 @@ class RequestController {
                               const uint32_t& mobile_correlation_id,
                               const uint32_t& new_timeout);
 
+    /*
+     * @brief Function Should be called when Low Voltage is occured
+     */
+    void OnLowVoltage();
+
+    /*
+     * @brief Function Should be called when Low Voltage is occured
+     */
+    void OnWakeUp();
+
+    bool IsLowVoltage();
   protected:
 
     /**
-     * @brief Checs if this app as able to add new requests, or limits was exceeded
+     * @brief Check if this app is able to add new requests, or limits was exceeded
      * @param app_id - application id
      * @param app_time_scale - time scale (seconds)
-     * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale secconds
+     * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale seconds
+     * @return True if new request could be added, false otherwise
      */
-    bool checkTimeScaleMaxRequest(const uint32_t& app_id,
+    bool CheckTimeScaleMaxRequest(const uint32_t& app_id,
                                   const uint32_t& app_time_scale,
                                   const uint32_t& max_request_per_time_scale);
 
     /**
-     * @brief Checs if this app as able to add new requests in current hmi_level, or limits was exceeded
+     * @brief Check if this app is able to add new requests in current hmi_level, or limits was exceeded
      * @param hmi_level - hmi level
      * @param app_id - application id
      * @param app_time_scale - time scale (seconds)
-     * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale secconds
+     * @param max_request_per_time_scale - maximum count of request that should be allowed for app_time_scale seconds
+     * @return True if new request could be added, false otherwise
      */
-    bool checkHMILevelTimeScaleMaxRequest(const mobile_apis::HMILevel::eType& hmi_level,
+    bool CheckHMILevelTimeScaleMaxRequest(const mobile_apis::HMILevel::eType& hmi_level,
                                           const uint32_t& app_id,
                                           const uint32_t& app_time_scale,
                                           const uint32_t& max_request_per_time_scale);
 
+    /**
+     * @brief Check Posibility to add new requests, or limits was exceeded
+     * @param pending_requests_amount - maximum count of request that should be allowed for all applications
+     * @return True if new request could be added, false otherwise
+     */
+    bool CheckPendingRequestsAmount(const uint32_t& pending_requests_amount);
+
     void onTimer();
 
     /**
@@ -220,6 +246,7 @@ class RequestController {
     */
     void UpdateTimer();
 
+
   private:
 
     // Data types
@@ -229,7 +256,7 @@ class RequestController {
         Worker(RequestController* requestController);
         virtual ~Worker();
         virtual void threadMain();
-        virtual bool exitThreadMain();
+        virtual void exitThreadMain();
       protected:
       private:
         RequestController*                               request_controller_;
@@ -242,7 +269,7 @@ class RequestController {
     uint32_t pool_size_;
     sync_primitives::ConditionalVariable cond_var_;
 
-    std::list<MobileRequestPtr> mobile_request_list_;
+    std::list<RequestPtr> mobile_request_list_;
     sync_primitives::Lock mobile_request_list_lock_;
 
     RequestInfoSet pending_request_set_;
@@ -256,6 +283,7 @@ class RequestController {
     timer::TimerThread<RequestController>  timer_;
     static const uint32_t dafault_sleep_time_ = UINT_MAX;
 
+    bool is_low_voltage_;
     DISALLOW_COPY_AND_ASSIGN(RequestController);
 };
 
diff --git a/src/components/application_manager/test/mock/include/application_manager/request_info.h b/src/components/application_manager/test/mock/include/application_manager/request_info.h
index b1409488fd..13efe07a76 100644
--- a/src/components/application_manager/test/mock/include/application_manager/request_info.h
+++ b/src/components/application_manager/test/mock/include/application_manager/request_info.h
@@ -1,34 +1,34 @@
-/**
-* \file request_info.h
-* \brief request information structure header file.
-*
-* Copyright (c) 2014, Ford Motor Company
-* 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 Ford Motor Company 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 HOLDER 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)
+/*
+ * \file request_info.h
+ * \brief request information structure header file.
+ *
+ * Copyright (c) 2014, Ford Motor Company
+ * 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 Ford Motor Company 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 HOLDER 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.
 */
@@ -52,19 +52,21 @@ namespace request_controller {
    *
    */
   typedef utils::SharedPtr<commands::Command> RequestPtr;
-  typedef utils::SharedPtr<commands::CommandRequestImpl> MobileRequestPtr;
 
   struct RequestInfo {
-    RequestInfo(const uint64_t timeout_sec)
+    enum RequestType {MobileRequest, HMIRequest};
+    RequestInfo(const RequestType requst_type, const uint64_t timeout_sec)
       : timeout_sec_(timeout_sec) {
         start_time_ = date_time::DateTime::getCurrentTime();
         updateEndTime();
+        requst_type_ = requst_type;
       }
 
-    RequestInfo(const TimevalStruct& start_time,const  uint64_t timeout_sec)
+    RequestInfo(const RequestType requst_type, const TimevalStruct& start_time,const  uint64_t timeout_sec)
       : start_time_(start_time),
         timeout_sec_(timeout_sec) {
         updateEndTime();
+        requst_type_ = requst_type;
     }
 
     virtual ~RequestInfo(){}
@@ -87,8 +89,8 @@ namespace request_controller {
     }
 
     bool isExpired() {
-      if ( date_time::GREATER ==
-           date_time::DateTime::compareTime(end_time_, date_time::DateTime::getCurrentTime()) ) {
+      if (date_time::GREATER ==
+           date_time::DateTime::compareTime(end_time_, date_time::DateTime::getCurrentTime())) {
         return false;
       }
       return true;
@@ -113,6 +115,9 @@ namespace request_controller {
     mobile_apis::HMILevel::eType hmi_level() {
       return hmi_level_;
     }
+    RequestType requst_type() const {
+       return requst_type_;
+     }
 
   protected:
     TimevalStruct                 start_time_;
@@ -120,6 +125,7 @@ namespace request_controller {
     TimevalStruct                 end_time_;
     uint32_t                      app_id_;
     mobile_apis::HMILevel::eType  hmi_level_;
+    RequestType                   requst_type_;
   };
 
   typedef utils::SharedPtr<RequestInfo> RequestInfoPtr;
diff --git a/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h b/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h
index 463df0b867..9d03fb0577 100644
--- a/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h
+++ b/src/components/application_manager/test/mock/include/application_manager/resume_ctrl.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -137,6 +137,7 @@ class ResumeCtrl: public event_engine::EventObserver {
      */
     void IgnitionOff();
 
+
     /**
      * @brief Start timer for resumption applications
      *        Restore D1-D5 data
@@ -192,13 +193,27 @@ class ResumeCtrl: public event_engine::EventObserver {
     uint32_t GetHMIApplicationID(const std::string& mobile_app_id);
 
     /**
-     * @brief Timer callback function
+     * @brief Timer callback for  restoring HMI Level
      *
      */
-    void onTimer();
+    void ApplicationResumptiOnTimer();
+
+
+    /**
+     * @brief SaveDataOnTimer :
+     *  Timer callback for persisting ResumptionData each N seconds
+     *  N gets from property
+     */
+    void SaveDataOnTimer();
 
     void ClearResumptionInfo();
 
+    void ApplicationsDataUpdated() {
+      is_data_saved = false;
+    }
+
+    void RestoreHmiLevel(uint32_t time_stamp, ApplicationSharedPtr application);
+
   private:
 
     typedef std::pair<uint32_t, uint32_t> application_timestamp;
@@ -260,10 +275,115 @@ class ResumeCtrl: public event_engine::EventObserver {
         NsSmartDeviceLink::NsSmartObjects::SmartObject* request = NULL,
         bool use_events = false);
 
+    void InsertToTimerQueue(uint32_t app_id, uint32_t time_stamp);
+
+    /**
+     * @brief AddFiles allows to add files for the application
+     * which should be resumed
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddFiles(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief AddSubmenues allows to add sub menues for the application
+     * which should be resumed
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddSubmenues(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief AddCommands allows to add commands for the application
+     * which should be resumed
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddCommands(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief AddChoicesets allows to add choice sets for the application
+     * which should be resumed
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddChoicesets(ApplicationSharedPtr application, const Json::Value& saved_app);
+
     /**
-     * @brief Time step to check resumption TIME_OUT
+     * @brief SetGlobalProperties allows to restore global properties.
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void SetGlobalProperties(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief AddSubscriptions allows to restore subscriptions
+     *
+     * @param application application which will be resumed
+     *
+     * @param saved_app application specific section from backup file
+     */
+    void AddSubscriptions(ApplicationSharedPtr application, const Json::Value& saved_app);
+
+    /**
+     * @brief ProcessHMIRequests allows to process obtained requests.
+     *
+     * @param requests request that should be processed.
+     */
+    void ProcessHMIRequests(const std::vector<smart_objects::SmartObject*> & requests);
+
+    /**
+     * @brief CheckIcons allows to check application icons
+     *
+     * @param application application under resumtion  application
+     *
+     * @param json_object
+     *
+     * @return true in case icons exists, false otherwise
+     */
+    bool CheckIcons(ApplicationSharedPtr application, const Json::Value& json_object);
+
+    /**
+     * @brief GetFromSavedOrAppend allows to get existed record about application
+     * or adds the new one.
+     *
+     * @param mobile_app_id application id.
+     *
+     * @return the reference to the record in applications array.
      */
-    static const uint32_t kTimeStep = 3;
+    Json::Value& GetFromSavedOrAppend(const std::string& mobile_app_id);
+
+    /**
+     * @brief GetObjectIndex allows to obtain specified obbject index from
+     * applications arrays.
+     *
+     * @param mobile_app_id application id that should be found.
+     *
+     * @return application's index of or -1 if it doesn't exists
+     */
+    int GetObjectIndex(const std::string& mobile_app_id);
+
+    template<typename Iterator>
+    Json::Value Append(Iterator first,
+                       Iterator last,
+                       const std::string& key,
+                       Json::Value& result) {
+      while (first != last) {
+        result[key].append(*first);
+        ++first;
+      }
+      return result;
+    }
 
     /**
      *  @brief times of IGN_OFF that zombie application have to be saved.
@@ -278,7 +398,10 @@ class ResumeCtrl: public event_engine::EventObserver {
     std::multiset<application_timestamp, TimeStampComparator> waiting_for_timer_;
     mutable sync_primitives::Lock   queue_lock_;
     ApplicationManagerImpl*         app_mngr_;
-    timer::TimerThread<ResumeCtrl>  timer_;
+    timer::TimerThread<ResumeCtrl>  restore_hmi_level_timer_;
+    timer::TimerThread<ResumeCtrl>  save_persistent_data_timer_;
+    bool is_data_saved;
+
 };
 
 }  // namespace application_manager
diff --git a/src/components/application_manager/test/mock/include/application_manager/time_metric_observer.h b/src/components/application_manager/test/mock/include/application_manager/time_metric_observer.h
index 780401f6f3..de3deb8372 100644
--- a/src/components/application_manager/test/mock/include/application_manager/time_metric_observer.h
+++ b/src/components/application_manager/test/mock/include/application_manager/time_metric_observer.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/mock/include/application_manager/usage_statistics.h b/src/components/application_manager/test/mock/include/application_manager/usage_statistics.h
index dcd57aee34..d6ff1f2c49 100644
--- a/src/components/application_manager/test/mock/include/application_manager/usage_statistics.h
+++ b/src/components/application_manager/test/mock/include/application_manager/usage_statistics.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *