Merge branch 'develop' into bugfix/media_manager_test_memory_leak

67 files changed, 574 insertions, 312 deletions

diff --git a/src/components/policy/policy_external/.gitignore b/src/components/policy/policy_external/.gitignore
index d67909069a..d6052d61da 100644
--- a/src/components/policy/policy_external/.gitignore
+++ b/src/components/policy/policy_external/.gitignore
@@ -29,8 +29,6 @@ src/appMain/hmi_link
 src/appMain/smartDeviceLinkCore
 test/components/application_manager/policies_manager/test_policies_table
 test/components/application_manager/test_formatters_commands
-test/components/dbus/test_DBusAdapter
-test/components/dbus/test_DBusSchema
 test/components/protocol_handler/test_ProtocolHandler
 test/components/request_watchdog/test_RequestWatchdog
 test/components/smart_objects/SchemaItem/test_SmartObject_AlwaysFalseSchemaItemTest
diff --git a/src/components/policy/policy_external/CMakeLists.txt b/src/components/policy/policy_external/CMakeLists.txt
index 8d04f20470..c66313240f 100644
--- a/src/components/policy/policy_external/CMakeLists.txt
+++ b/src/components/policy/policy_external/CMakeLists.txt
@@ -55,13 +55,10 @@ set(SOURCES
   ${POLICY_PATH}/src/update_status_manager.cc
   ${POLICY_PATH}/src/status.cc
   ${POLICY_PATH}/src/cache_manager.cc
+  ${POLICY_PATH}/src/access_remote_impl.cc
   ${COMPONENTS_DIR}/rpc_base/src/rpc_base/rpc_base.cc
 )
 
-if (REMOTE_CONTROL)
-  list(APPEND SOURCES ${POLICY_PATH}/src/access_remote_impl.cc)
-endif()
-
 list(APPEND SOURCES
   ${POLICY_PATH}/src/sql_pt_ext_queries.cc
   ${POLICY_PATH}/src/sql_pt_ext_representation.cc
diff --git a/src/components/policy/policy_external/include/policy/access_remote_impl.h b/src/components/policy/policy_external/include/policy/access_remote_impl.h
index 0fa53b0237..cee2a8774f 100644
--- a/src/components/policy/policy_external/include/policy/access_remote_impl.h
+++ b/src/components/policy/policy_external/include/policy/access_remote_impl.h
@@ -35,7 +35,7 @@
 #include <map>
 #include "policy/policy_table/types.h"
 #include "utils/macro.h"
-#include "utils/shared_ptr.h"
+
 #include "policy/access_remote.h"
 #include "policy/cache_manager.h"
 
@@ -46,7 +46,7 @@ namespace policy {
 class AccessRemoteImpl : public AccessRemote {
  public:
   AccessRemoteImpl();
-  explicit AccessRemoteImpl(utils::SharedPtr<CacheManager> cache);
+  explicit AccessRemoteImpl(std::shared_ptr<CacheManager> cache);
   /**
    * @brief CheckModuleType check if module type is allowed for application
    * @param app_id application id
@@ -144,7 +144,7 @@ class AccessRemoteImpl : public AccessRemote {
   /**
    * @brief cache_ contains pointer to cache manager instance
    */
-  utils::SharedPtr<CacheManager> cache_;
+  std::shared_ptr<CacheManager> cache_;
 
   /**
    * @brief hmi_types_ contains list of default HMI types for applications
diff --git a/src/components/policy/policy_external/include/policy/cache_manager.h b/src/components/policy/policy_external/include/policy/cache_manager.h
index f41ddb14cd..d30e7cea24 100644
--- a/src/components/policy/policy_external/include/policy/cache_manager.h
+++ b/src/components/policy/policy_external/include/policy/cache_manager.h
@@ -35,7 +35,6 @@
 
 #include <map>
 
-#include "utils/shared_ptr.h"
 #include "policy/pt_representation.h"
 #include "policy/pt_ext_representation.h"
 #include "policy/usage_statistics/statistics_manager.h"
@@ -232,7 +231,7 @@ class CacheManager : public CacheManagerInterface {
    * device_info, statistics, excluding user messages
    * @return Generated structure for obtaining Json string.
    */
-  virtual utils::SharedPtr<policy_table::Table> GenerateSnapshot();
+  virtual std::shared_ptr<policy_table::Table> GenerateSnapshot();
 
   /**
    * Applies policy table to the current table
@@ -720,7 +719,7 @@ class CacheManager : public CacheManagerInterface {
   void SetExternalConsentForApp(const PermissionConsent& permissions) OVERRIDE;
 
 #ifdef BUILD_TESTS
-  utils::SharedPtr<policy_table::Table> GetPT() const {
+  std::shared_ptr<policy_table::Table> GetPT() const {
     return pt_;
   }
 #endif
@@ -782,15 +781,15 @@ class CacheManager : public CacheManagerInterface {
                                policy::Permissions& permission);
 
  private:
-  utils::SharedPtr<policy_table::Table> pt_;
-  utils::SharedPtr<policy_table::Table> snapshot_;
-  utils::SharedPtr<PTRepresentation> backup_;
-  utils::SharedPtr<PTExtRepresentation> ex_backup_;
+  std::shared_ptr<policy_table::Table> pt_;
+  std::shared_ptr<policy_table::Table> snapshot_;
+  std::shared_ptr<PTRepresentation> backup_;
+  std::shared_ptr<PTExtRepresentation> ex_backup_;
   bool update_required;
   typedef std::set<std::string> UnpairedDevices;
   UnpairedDevices is_unpaired_;
 
-  mutable sync_primitives::Lock cache_lock_;
+  mutable sync_primitives::RecursiveLock cache_lock_;
   sync_primitives::Lock unpaired_lock_;
 
   typedef std::map<std::string, Permissions> AppCalculatedPermissions;
diff --git a/src/components/policy/policy_external/include/policy/cache_manager_interface.h b/src/components/policy/policy_external/include/policy/cache_manager_interface.h
index 1d74780f19..bb9ce14c7f 100644
--- a/src/components/policy/policy_external/include/policy/cache_manager_interface.h
+++ b/src/components/policy/policy_external/include/policy/cache_manager_interface.h
@@ -38,7 +38,7 @@
 
 #include "policy/policy_table/types.h"
 #include "policy/pt_representation.h"
-#include "utils/shared_ptr.h"
+
 #include "policy/usage_statistics/counter.h"
 #include "policy/policy_types.h"
 #include "policy/policy_settings.h"
@@ -237,7 +237,7 @@ class CacheManagerInterface {
    * device_info, statistics, excluding user messages
    * @return Generated structure for obtaining Json string.
    */
-  virtual utils::SharedPtr<policy_table::Table> GenerateSnapshot() = 0;
+  virtual std::shared_ptr<policy_table::Table> GenerateSnapshot() = 0;
 
   /**
    * Applies policy table to the current table
@@ -823,16 +823,16 @@ class CacheManagerInterface {
 
 #ifdef BUILD_TESTS
   /**
-   * @brief GetPT allows to obtain SharedPtr to PT.
+   * @brief GetPT allows to obtain std::shared_ptr to PT.
    * Used ONLY in Unit tests
-   * @return SharedPTR to PT
+   * @return std::shared_ptr to PT
    *
    */
-  virtual utils::SharedPtr<policy_table::Table> GetPT() const = 0;
+  virtual std::shared_ptr<policy_table::Table> GetPT() const = 0;
 #endif
 };
 
-typedef utils::SharedPtr<CacheManagerInterface> CacheManagerInterfaceSPtr;
+typedef std::shared_ptr<CacheManagerInterface> CacheManagerInterfaceSPtr;
 
 }  // namespace policy
 
diff --git a/src/components/policy/policy_external/include/policy/policy_helper.h b/src/components/policy/policy_external/include/policy/policy_helper.h
index e399b44719..6f916b7cd0 100644
--- a/src/components/policy/policy_external/include/policy/policy_helper.h
+++ b/src/components/policy/policy_external/include/policy/policy_helper.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_HELPER_H_
 
 #include "policy/policy_table/functions.h"
-#include "utils/shared_ptr.h"
+
 #include "policy/policy_types.h"
 
 namespace policy {
@@ -85,8 +85,8 @@ bool operator!=(const policy_table::ApplicationParams& first,
  */
 struct CheckAppPolicy {
   CheckAppPolicy(PolicyManagerImpl* pm,
-                 const utils::SharedPtr<policy_table::Table> update,
-                 const utils::SharedPtr<policy_table::Table> snapshot,
+                 const std::shared_ptr<policy_table::Table> update,
+                 const std::shared_ptr<policy_table::Table> snapshot,
                  CheckAppPolicyResults& out_results);
 
   bool operator()(const AppPoliciesValueType& app_policy);
@@ -202,8 +202,8 @@ struct CheckAppPolicy {
 
  private:
   PolicyManagerImpl* pm_;
-  const utils::SharedPtr<policy_table::Table> update_;
-  const utils::SharedPtr<policy_table::Table> snapshot_;
+  const std::shared_ptr<policy_table::Table> update_;
+  const std::shared_ptr<policy_table::Table> snapshot_;
   CheckAppPolicyResults& out_results_;
 };
 
@@ -255,8 +255,26 @@ struct FillNotificationData {
                              const std::set<Parameter>& target);
   void InitRpcKeys(const std::string& rpc_name);
   bool RpcParametersEmpty(RpcPermissions& rpc);
-  bool IsSectionEmpty(ParameterPermissions& permissions,
-                      const std::string& section);
+
+  /**
+   * @brief Checks if specific section in specified permissions is empty
+   * @param permissions reference to the permissions structure
+   * @param section reference to the section name
+   * @return true if specified section in permissions is empty otherwise returns
+   * false
+   */
+  bool IsSectionEmpty(const ParameterPermissions& permissions,
+                      const std::string& section) const;
+
+  /**
+   * @brief Checks if at least one parameter is allowed for the specified
+   * permissions
+   * @param permissions reference to the permissions structure
+   * @return true if at least one parameter is allowed for the specified
+   * permissions otherwise returns false
+   */
+  bool IsSomeParameterAllowed(const ParameterPermissions& permissions) const;
+
   std::string current_key_;
   Permissions& data_;
   const bool does_require_user_consent_;
diff --git a/src/components/policy/policy_external/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
index fcd9c9f69a..3837dda1fa 100644
--- a/src/components/policy/policy_external/include/policy/policy_manager_impl.h
+++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_
 
 #include <list>
-#include "utils/shared_ptr.h"
+
 #include "utils/lock.h"
 #include "policy/policy_manager.h"
 #include "policy/policy_table.h"
@@ -42,11 +42,8 @@
 #include "policy/update_status_manager.h"
 #include "policy/policy_table/functions.h"
 #include "policy/usage_statistics/statistics_manager.h"
-
-#ifdef SDL_REMOTE_CONTROL
 #include "policy/access_remote.h"
 #include "policy/access_remote_impl.h"
-#endif  // SDL_REMOTE_CONTROL
 
 namespace policy_table = rpc::policy_table_interface_base;
 
@@ -454,7 +451,6 @@ class PolicyManagerImpl : public PolicyManager {
       const std::string& application_id,
       const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) OVERRIDE;
 
-#ifdef SDL_REMOTE_CONTROL
   /**
    * @brief Assigns new HMI types for specified application
    * @param application_id Unique application id
@@ -476,7 +472,7 @@ class PolicyManagerImpl : public PolicyManager {
    * @brief Setter for access_remote instance
    * @param access_remote pointer to new access_remote instance
    */
-  void set_access_remote(utils::SharedPtr<AccessRemote> access_remote) OVERRIDE;
+  void set_access_remote(std::shared_ptr<AccessRemote> access_remote) OVERRIDE;
 
   /**
    * @brief Sends notification about application HMI level changed
@@ -489,7 +485,6 @@ class PolicyManagerImpl : public PolicyManager {
    * @param application_id Unique id of application
    */
   void OnPrimaryGroupsChanged(const std::string& application_id);
-#endif  // SDL_REMOTE_CONTROL
 
   /**
    * @brief Removes consent for application functional group
@@ -722,7 +717,7 @@ class PolicyManagerImpl : public PolicyManager {
    * @param pt_content binary content of PT
    * @return pointer to converted PT
    */
-  virtual utils::SharedPtr<policy_table::Table> Parse(
+  virtual std::shared_ptr<policy_table::Table> Parse(
       const BinaryMessage& pt_content);
 
  private:
@@ -741,8 +736,8 @@ class PolicyManagerImpl : public PolicyManager {
    * @return Collection per-application results
    */
   CheckAppPolicyResults CheckPermissionsChanges(
-      const utils::SharedPtr<policy_table::Table> update,
-      const utils::SharedPtr<policy_table::Table> snapshot);
+      const std::shared_ptr<policy_table::Table> update,
+      const std::shared_ptr<policy_table::Table> snapshot);
 
   /**
    * @brief Processes results from policy table update analysis done by
@@ -865,10 +860,9 @@ class PolicyManagerImpl : public PolicyManager {
    * @param type policy table type
    * @return true if policy table valid, otherwise false
    */
-  bool IsPTValid(utils::SharedPtr<policy_table::Table> policy_table,
+  bool IsPTValid(std::shared_ptr<policy_table::Table> policy_table,
                  policy_table::PolicyTableType type) const;
 
-#ifdef SDL_REMOTE_CONTROL
   /**
    * @brief Get resulting RPCs permissions for application which started on
    * specific device
@@ -905,7 +899,6 @@ class PolicyManagerImpl : public PolicyManager {
     */
   bool GetModuleTypes(const std::string& policy_app_id,
                       std::vector<std::string>* modules) const OVERRIDE;
-#endif  // SDL_REMOTE_CONTROL
 
   /**
    * @brief Notify application about its permissions changes by preparing and
@@ -1021,12 +1014,10 @@ class PolicyManagerImpl : public PolicyManager {
    * @brief pointer to CacheManagerInterface instance for getting policy data
    */
   CacheManagerInterfaceSPtr cache_;
-#ifdef SDL_REMOTE_CONTROL
   /**
    * @brief pointer to AccessRemote instance for working with RC applications
    */
-  utils::SharedPtr<AccessRemote> access_remote_;
-#endif
+  std::shared_ptr<AccessRemote> access_remote_;
 
   /**
    * @brief lock guard for protecting applications list access
diff --git a/src/components/policy/policy_external/include/policy/policy_table.h b/src/components/policy/policy_external/include/policy/policy_table.h
index ecbd56c2e4..fe27f1cb57 100644
--- a/src/components/policy/policy_external/include/policy/policy_table.h
+++ b/src/components/policy/policy_external/include/policy/policy_table.h
@@ -33,7 +33,6 @@
 #ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_
 #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_
 
-#include "utils/shared_ptr.h"
 #include "policy/pt_representation.h"
 #include "policy/pt_ext_representation.h"
 
@@ -42,7 +41,7 @@ namespace policy {
 class PolicyTable {
  public:
   PolicyTable();
-  explicit PolicyTable(utils::SharedPtr<PTRepresentation> pt_data);
+  explicit PolicyTable(std::shared_ptr<PTRepresentation> pt_data);
   virtual ~PolicyTable();
 
   /**
@@ -50,12 +49,12 @@ class PolicyTable {
    * actual class storing policy table.
    * @return PTRepresentation* Policy Table Content Handler
    */
-  utils::SharedPtr<PTRepresentation> pt_data() const {
+  std::shared_ptr<PTRepresentation> pt_data() const {
     return pt_data_;
   }
 
  private:
-  utils::SharedPtr<PTRepresentation> pt_data_;
+  std::shared_ptr<PTRepresentation> pt_data_;
 };
 }  // namespace policy
 
diff --git a/src/components/policy/policy_external/include/policy/policy_table/enums.h b/src/components/policy/policy_external/include/policy/policy_table/enums.h
index 96a6748436..a31e955d99 100644
--- a/src/components/policy/policy_external/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/enums.h
@@ -66,6 +66,7 @@ enum Parameter {
   P_SPEED,
   P_ENGINETORQUE,
   P_EXTERNALTEMPERATURE,
+  P_TURNSIGNAL,
   P_FUELLEVEL,
   P_FUELLEVEL_STATE,
   P_HEADLAMPSTATUS,
@@ -77,6 +78,7 @@ enum Parameter {
   P_VIN,
   P_ACCPEDALPOSITION,
   P_BELTSTATUS,
+  P_ELECTRONICPARKBRAKESTATUS,
   P_DRIVERBRAKING,
   P_PRNDL,
   P_RPM,
@@ -90,7 +92,6 @@ enum Parameter {
   P_EMERGENCYEVENT,
   P_ECALLINFO,
   P_ABS_STATE,
-  P_TURN_SIGNAL,
   P_FUEL_RANGE,
   P_TIRE_PRESSURE_VALUE,
   P_TPMS,
@@ -169,6 +170,11 @@ bool EnumFromJsonString(const std::string& literal, Input* result);
 enum ModuleType {
   MT_CLIMATE,
   MT_RADIO,
+  MT_SEAT,
+  MT_AUDIO,
+  MT_LIGHT,
+  MT_HMI_SETTINGS,
+  MT_EMPTY
 };
 bool IsValidEnum(ModuleType val);
 const char* EnumToJsonString(ModuleType val);
diff --git a/src/components/policy/policy_external/include/policy/policy_table/types.h b/src/components/policy/policy_external/include/policy/policy_table/types.h
index 1b1419365d..68e29a97ee 100644
--- a/src/components/policy/policy_external/include/policy/policy_table/types.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/types.h
@@ -104,11 +104,9 @@ typedef Array<Enum<RequestType>, 0, 255> RequestsTypeArray;
 
 typedef Strings RequestSubTypes;
 
-#ifdef SDL_REMOTE_CONTROL
 typedef Map<Strings, 0, 255> RemoteRpcs;
 typedef Map<RemoteRpcs, 0, 255> AccessModules;
 typedef Array<Enum<ModuleType>, 0, 255> ModuleTypes;
-#endif  // SDL_REMOTE_CONTROL
 
 typedef AppHMIType AppHmiType;
 typedef std::vector<AppHMIType> AppHmiTypes;
@@ -178,9 +176,7 @@ struct ApplicationParams : PolicyBase {
   Optional<RequestSubTypes> RequestSubType;
   Optional<Integer<uint16_t, 0, 65225> > memory_kb;
   Optional<Integer<uint32_t, 0, UINT_MAX> > heart_beat_timeout_ms;
-#ifdef SDL_REMOTE_CONTROL
   mutable Optional<ModuleTypes> moduleType;
-#endif  // SDL_REMOTE_CONTROL
 
  public:
   ApplicationParams();
@@ -200,9 +196,7 @@ struct ApplicationParams : PolicyBase {
 
  private:
   bool Validate() const;
-#ifdef SDL_REMOTE_CONTROL
   bool ValidateModuleTypes() const;
-#endif  // SDL_REMOTE_CONTROL
 };
 
 struct ApplicationPoliciesSection : CompositeType {
@@ -309,6 +303,7 @@ struct ModuleConfig : CompositeType {
   Optional<String<0, 10> > preloaded_date;
   Optional<String<0, 65535> > certificate;
   Optional<Boolean> preloaded_pt;
+  Optional<Boolean> full_app_id_supported;
 
  public:
   ModuleConfig();
diff --git a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
index 577f15c3f5..26af165506 100644
--- a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
+++ b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
@@ -26,6 +26,7 @@
         <element name="speed" />
         <element name="engineTorque" />
         <element name="externalTemperature" />
+        <element name="turnSignal" />
         <element name="fuelLevel" />
         <element name="fuelLevel_State" />
         <element name="headLampStatus" />
@@ -37,6 +38,7 @@
         <element name="vin" />
         <element name="accPedalPosition" />
         <element name="beltStatus" />
+        <element name="electronicParkBrakeStatus" />
         <element name="driverBraking" />
         <element name="prndl" />
         <element name="rpm" />
@@ -96,8 +98,7 @@
 
     <typedef name="HmiLevels" type="HmiLevel" array="true"
         maxsize="4" />
-    <typedef name="Parameters" type="Parameter" array="true"
-        maxsize="24" />
+    <typedef name="Parameters" type="Parameter" array="true"/>
 
     <struct name="RpcParameters">
         <!-- maxsizes are equal to number of currently known elements of
@@ -138,6 +139,7 @@
     <struct name="ModuleConfig">
         <param name="device_certificates" type="String" minlength="1" maxlength="100" mandatory="false" map="true" minsize="1" maxsize="255" />
         <param name="preloaded_pt" type="Boolean" mandatory="false" />
+        <param name="full_app_id_supported" type="Boolean" mandatory="false" />
         <param name="exchange_after_x_ignition_cycles" type="Integer"
             maxvalue="255" />
         <param name="exchange_after_x_kilometers" type="Integer"
diff --git a/src/components/policy/policy_external/include/policy/policy_types.h b/src/components/policy/policy_external/include/policy/policy_types.h
index 9682b3d58d..84d9376a93 100644
--- a/src/components/policy/policy_external/include/policy/policy_types.h
+++ b/src/components/policy/policy_external/include/policy/policy_types.h
@@ -39,7 +39,8 @@
 #include <map>
 #include <set>
 #include <utility>
-#include "utils/shared_ptr.h"
+#include <memory>
+
 #include "utils/helpers.h"
 #include "transport_manager/common.h"
 
@@ -79,7 +80,7 @@ enum PolicyTableStatus {
 // Code generator uses String class name, so this typedef was renamed to PTSring
 typedef std::string PTString;
 typedef std::vector<uint8_t> BinaryMessage;
-typedef utils::SharedPtr<BinaryMessage> BinaryMessageSptr;
+typedef std::shared_ptr<BinaryMessage> BinaryMessageSptr;
 
 typedef std::string HMILevel;
 typedef std::string Parameter;
diff --git a/src/components/policy/policy_external/include/policy/pt_representation.h b/src/components/policy/policy_external/include/policy/pt_representation.h
index 66a9218771..f25fcc6cab 100644
--- a/src/components/policy/policy_external/include/policy/pt_representation.h
+++ b/src/components/policy/policy_external/include/policy/pt_representation.h
@@ -213,7 +213,7 @@ class PTRepresentation {
    * device_info, statistics, excluding user messages
    * @return Generated structure for obtaining Json string.
    */
-  virtual utils::SharedPtr<policy_table::Table> GenerateSnapshot() const = 0;
+  virtual std::shared_ptr<policy_table::Table> GenerateSnapshot() const = 0;
 
   virtual bool Save(const policy_table::Table& table) = 0;
 
diff --git a/src/components/policy/policy_external/include/policy/sql_pt_representation.h b/src/components/policy/policy_external/include/policy/sql_pt_representation.h
index c32e3205ef..13816eb6c5 100644
--- a/src/components/policy/policy_external/include/policy/sql_pt_representation.h
+++ b/src/components/policy/policy_external/include/policy/sql_pt_representation.h
@@ -85,7 +85,7 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   bool Clear();
   bool Drop();
   virtual void WriteDb();
-  virtual utils::SharedPtr<policy_table::Table> GenerateSnapshot() const;
+  virtual std::shared_ptr<policy_table::Table> GenerateSnapshot() const;
   virtual bool Save(const policy_table::Table& table);
   bool GetInitialAppData(const std::string& app_id,
                          StringArray* nicknames = NULL,
@@ -98,7 +98,6 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   }
 #endif  // BUILD_TESTS
  protected:
-#ifdef SDL_REMOTE_CONTROL
   enum TypeAccess { kAllowed, kManual };
   bool GatherModuleType(const std::string& app_id,
                         policy_table::ModuleTypes* module_types) const;
@@ -113,7 +112,6 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   bool SaveAccessModule(TypeAccess access,
                         const policy_table::AccessModules& modules);
   bool SaveRemoteRpc(int module_id, const policy_table::RemoteRpcs& rpcs);
-#endif  // SDL_REMOTE_CONTROL
 
   virtual void GatherModuleMeta(policy_table::ModuleMeta* meta) const;
   virtual void GatherModuleConfig(policy_table::ModuleConfig* config) const;
diff --git a/src/components/policy/policy_external/include/policy/update_status_manager.h b/src/components/policy/policy_external/include/policy/update_status_manager.h
index b663610a5b..b4a373d1cf 100644
--- a/src/components/policy/policy_external/include/policy/update_status_manager.h
+++ b/src/components/policy/policy_external/include/policy/update_status_manager.h
@@ -66,14 +66,14 @@ class UpdateStatusManager {
    * @brief Set next status during event processing
    * @param status Status shared pointer
    */
-  void SetNextStatus(utils::SharedPtr<Status> status);
+  void SetNextStatus(std::shared_ptr<Status> status);
 
   /**
    * @brief Set postponed status (will be set after next status) during event
    * processing
    * @param status Status shared pointer
    */
-  void SetPostponedStatus(utils::SharedPtr<Status> status);
+  void SetPostponedStatus(std::shared_ptr<Status> status);
 
   /**
    * @brief Sets listener pointer
@@ -199,17 +199,17 @@ class UpdateStatusManager {
   /**
    * @brief Current update status
    */
-  utils::SharedPtr<Status> current_status_;
+  std::shared_ptr<Status> current_status_;
 
   /**
    * @brief Next status after current to be set
    */
-  utils::SharedPtr<Status> next_status_;
+  std::shared_ptr<Status> next_status_;
 
   /**
    * @brief Status to be set after 'next' status
    */
-  utils::SharedPtr<Status> postponed_status_;
+  std::shared_ptr<Status> postponed_status_;
   sync_primitives::Lock status_lock_;
 
   UpdateEvent last_processed_event_;
@@ -227,7 +227,7 @@ class UpdateStatusManager {
 
     volatile uint32_t timeout_;
     volatile bool stop_flag_;
-    sync_primitives::Lock state_lock_;
+    sync_primitives::RecursiveLock state_lock_;
     sync_primitives::ConditionalVariable termination_condition_;
     UpdateStatusManager* update_status_manager_;
   };
diff --git a/src/components/policy/policy_external/include/policy/usage_statistics/counter.h b/src/components/policy/policy_external/include/policy/usage_statistics/counter.h
index adaef0eb28..c145bb432b 100644
--- a/src/components/policy/policy_external/include/policy/usage_statistics/counter.h
+++ b/src/components/policy/policy_external/include/policy/usage_statistics/counter.h
@@ -36,7 +36,7 @@
 #include <ctime>
 #include "policy/usage_statistics/statistics_manager.h"
 #include "policy/usage_statistics/app_stopwatch.h"
-#include "utils/shared_ptr.h"
+
 #include "utils/timer.h"
 #include "utils/macro.h"
 
@@ -46,18 +46,18 @@ using timer::Timer;
 
 class GlobalCounter {
  public:
-  GlobalCounter(utils::SharedPtr<StatisticsManager> statistics_manager,
+  GlobalCounter(std::shared_ptr<StatisticsManager> statistics_manager,
                 GlobalCounterId counter_type);
   void operator++() const;
 
  private:
   GlobalCounterId counter_type_;
-  utils::SharedPtr<StatisticsManager> statistics_manager_;
+  std::shared_ptr<StatisticsManager> statistics_manager_;
 };
 
 class AppCounter {
  public:
-  AppCounter(utils::SharedPtr<StatisticsManager> statistics_manager,
+  AppCounter(std::shared_ptr<StatisticsManager> statistics_manager,
              const std::string& app_id,
              AppCounterId counter_type);
   void operator++() const;
@@ -65,12 +65,12 @@ class AppCounter {
  private:
   std::string app_id_;
   AppCounterId counter_type_;
-  utils::SharedPtr<StatisticsManager> statistics_manager_;
+  std::shared_ptr<StatisticsManager> statistics_manager_;
 };
 
 class AppInfo {
  public:
-  AppInfo(utils::SharedPtr<StatisticsManager> statistics_manager,
+  AppInfo(std::shared_ptr<StatisticsManager> statistics_manager,
           const std::string& app_id,
           AppInfoId info_type);
   void Update(const std::string& new_info) const;
@@ -78,14 +78,14 @@ class AppInfo {
  private:
   std::string app_id_;
   AppInfoId info_type_;
-  utils::SharedPtr<StatisticsManager> statistics_manager_;
+  std::shared_ptr<StatisticsManager> statistics_manager_;
 };
 
 class AppStopwatchImpl : public AppStopwatch {
  public:
-  AppStopwatchImpl(utils::SharedPtr<StatisticsManager> statistics_manager,
+  AppStopwatchImpl(std::shared_ptr<StatisticsManager> statistics_manager,
                    const std::string& app_id);
-  AppStopwatchImpl(utils::SharedPtr<StatisticsManager> statistics_manager,
+  AppStopwatchImpl(std::shared_ptr<StatisticsManager> statistics_manager,
                    const std::string& app_id,
                    std::uint32_t timeout);
   ~AppStopwatchImpl();
@@ -97,7 +97,7 @@ class AppStopwatchImpl : public AppStopwatch {
   // Fields
   std::string app_id_;
   AppStopwatchId stopwatch_type_;
-  utils::SharedPtr<StatisticsManager> statistics_manager_;
+  std::shared_ptr<StatisticsManager> statistics_manager_;
   timer::Timer timer_;
   const std::uint32_t time_out_;
   DISALLOW_COPY_AND_ASSIGN(AppStopwatchImpl);
diff --git a/src/components/policy/policy_external/src/access_remote_impl.cc b/src/components/policy/policy_external/src/access_remote_impl.cc
index d042d8c402..26c8c5e38e 100644
--- a/src/components/policy/policy_external/src/access_remote_impl.cc
+++ b/src/components/policy/policy_external/src/access_remote_impl.cc
@@ -89,7 +89,7 @@ struct ToModuleType {
 
 AccessRemoteImpl::AccessRemoteImpl() : cache_(new CacheManager()) {}
 
-AccessRemoteImpl::AccessRemoteImpl(utils::SharedPtr<CacheManager> cache)
+AccessRemoteImpl::AccessRemoteImpl(std::shared_ptr<CacheManager> cache)
     : cache_(cache) {}
 
 bool AccessRemoteImpl::CheckModuleType(const PTString& app_id,
diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc
index 00bb1e4a1c..e4a4151fa4 100644
--- a/src/components/policy/policy_external/src/cache_manager.cc
+++ b/src/components/policy/policy_external/src/cache_manager.cc
@@ -253,8 +253,7 @@ CacheManager::CacheManager()
     : CacheManagerInterface()
     , pt_(new policy_table::Table)
     , backup_(new SQLPTExtRepresentation())
-    , update_required(false)
-    , cache_lock_(true) {
+    , update_required(false) {
   InitBackupThread();
 }
 
@@ -262,8 +261,7 @@ CacheManager::CacheManager(bool in_memory)
     : CacheManagerInterface()
     , pt_(new policy_table::Table)
     , backup_(new SQLPTExtRepresentation(in_memory))
-    , update_required(false)
-    , cache_lock_(true) {
+    , update_required(false) {
   InitBackupThread();
 }
 
@@ -1119,8 +1117,8 @@ bool CacheManager::SetUserPermissionsForApp(
           it_group->second != is_allowed) {
         *out_app_permissions_changed = true;
 
-        const TimevalStruct tm = date_time::DateTime::getCurrentTime();
-        int64_t current_time_msec = date_time::DateTime::getmSecs(tm);
+        const date_time::TimeDuration tm = date_time::getCurrentTime();
+        int64_t current_time_msec = date_time::getmSecs(tm);
         ucr.consent_last_updated = current_time_msec;
         LOG4CXX_DEBUG(logger_, "Updating consents time " << current_time_msec);
       }
@@ -1333,7 +1331,7 @@ int CacheManager::TimeoutResponse() {
   CACHE_MANAGER_CHECK(0);
   sync_primitives::AutoLock auto_lock(cache_lock_);
   return pt_->policy_table.module_config.timeout_after_x_seconds *
-         date_time::DateTime::MILLISECONDS_IN_SECOND;
+         date_time::MILLISECONDS_IN_SECOND;
 }
 
 bool CacheManager::SecondsBetweenRetries(std::vector<int>& seconds) {
@@ -1519,6 +1517,9 @@ void CacheManager::CheckSnapshotInitialization() {
 
   *(snapshot_->policy_table.module_config.preloaded_pt) = false;
 
+  *(snapshot_->policy_table.module_config.full_app_id_supported) =
+      settings_->use_full_app_id();
+
   // SDL must not send certificate in snapshot
   snapshot_->policy_table.module_config.certificate =
       rpc::Optional<rpc::String<0, 65535> >();
@@ -1627,8 +1628,8 @@ void CacheManager::CheckSnapshotInitialization() {
 
 void CacheManager::PersistData() {
   LOG4CXX_AUTO_TRACE(logger_);
-  if (backup_.valid()) {
-    if (pt_.valid()) {
+  if (backup_.use_count() != 0) {
+    if (pt_.use_count() != 0) {
       // Comma expression is used to hold the lock only during the constructor
       // call
       policy_table::Table copy_pt(
@@ -1670,7 +1671,7 @@ void CacheManager::PersistData() {
       }
 
       // In case of extended policy the meta info should be backuped as well.
-      if (ex_backup_.valid()) {
+      if (ex_backup_.use_count() != 0) {
         ex_backup_->SetMetaInfo(
             *(*copy_pt.policy_table.module_meta).ccpu_version,
             *(*copy_pt.policy_table.module_meta).wers_country_code,
@@ -1750,9 +1751,9 @@ bool CacheManager::IsPermissionsCalculated(const std::string& device_id,
   return false;
 }
 
-utils::SharedPtr<policy_table::Table> CacheManager::GenerateSnapshot() {
+std::shared_ptr<policy_table::Table> CacheManager::GenerateSnapshot() {
   CACHE_MANAGER_CHECK(snapshot_);
-  snapshot_ = new policy_table::Table();
+  snapshot_ = std::make_shared<policy_table::Table>();
   sync_primitives::AutoLock auto_lock(cache_lock_);
   snapshot_->policy_table = pt_->policy_table;
 
@@ -2237,8 +2238,7 @@ bool CacheManager::Init(const std::string& file_name,
   LOG4CXX_AUTO_TRACE(logger_);
   settings_ = settings;
   InitResult init_result = backup_->Init(settings);
-  ex_backup_ = utils::SharedPtr<PTRepresentation>::dynamic_pointer_cast<
-      PTExtRepresentation>(backup_);
+  ex_backup_ = std::dynamic_pointer_cast<PTExtRepresentation>(backup_);
 
   bool result = true;
   switch (init_result) {
@@ -2261,7 +2261,7 @@ bool CacheManager::Init(const std::string& file_name,
     case InitResult::SUCCESS: {
       LOG4CXX_INFO(logger_, "Policy Table was inited successfully");
       result = LoadFromFile(file_name, *pt_);
-      utils::SharedPtr<policy_table::Table> snapshot = GenerateSnapshot();
+      std::shared_ptr<policy_table::Table> snapshot = GenerateSnapshot();
 
       result &= snapshot->is_valid();
       LOG4CXX_DEBUG(logger_,
@@ -2651,8 +2651,8 @@ void CacheManager::SetExternalConsentForApp(
       (*(*pt_->policy_table.device_data)[permissions.device_id]
             .user_consent_records)[permissions.policy_app_id];
 
-  const TimevalStruct tm = date_time::DateTime::getCurrentTime();
-  int64_t current_time_msec = date_time::DateTime::getmSecs(tm);
+  const date_time::TimeDuration tm = date_time::getCurrentTime();
+  int64_t current_time_msec = date_time::getmSecs(tm);
   app_consent_records.ext_consent_last_updated = current_time_msec;
   LOG4CXX_DEBUG(logger_, "Updating consents time " << current_time_msec);
 
diff --git a/src/components/policy/policy_external/src/policy_helper.cc b/src/components/policy/policy_external/src/policy_helper.cc
index 39b9399c24..2358c54bef 100644
--- a/src/components/policy/policy_external/src/policy_helper.cc
+++ b/src/components/policy/policy_external/src/policy_helper.cc
@@ -122,8 +122,8 @@ bool operator!=(const policy_table::ApplicationParams& first,
 
 CheckAppPolicy::CheckAppPolicy(
     PolicyManagerImpl* pm,
-    const utils::SharedPtr<policy_table::Table> update,
-    const utils::SharedPtr<policy_table::Table> snapshot,
+    const std::shared_ptr<policy_table::Table> update,
+    const std::shared_ptr<policy_table::Table> snapshot,
     CheckAppPolicyResults& out_results)
     : pm_(pm)
     , update_(update)
@@ -620,7 +620,16 @@ void FillNotificationData::UpdateParameters(
   ParametersConstItr it_parameters = in_parameters.begin();
   ParametersConstItr it_parameters_end = in_parameters.end();
 
-  // Due to APPLINK-24201 SDL must consider cases when 'parameters' section is
+  // To determine consent for a particular RPC in a particular HMI level with
+  // particular parameters (if applicable), the system shall find all of the
+  // functional groups the RPC is included in. If user consent is needed as
+  // listed within the functional group in the policy table, the system shall
+  // use a logical AND: backend permissions AND User permissions. If the RPC is
+  // listed under more than one group, the system shall perform a logical OR
+  // amongst all of the possible allowed permissions scenarios for the RPC (and
+  // parameter/or HMI level) defined by each of the functional groups.
+
+  // Due to requirements SDL must consider cases when 'parameters' section is
   // not present for RPC or present, but is empty.
 
   // If 'parameters' section is like: 'parameters' : []
@@ -635,10 +644,8 @@ void FillNotificationData::UpdateParameters(
 
   // If 'parameters' section is omitted
   if (!in_parameters.is_initialized()) {
-    if (!does_require_user_consent_) {
-      out_parameter.any_parameter_allowed = true;
-    }
-    if (does_require_user_consent_ && kAllowedKey == current_key_) {
+    if (!does_require_user_consent_ ||
+        (does_require_user_consent_ && kAllowedKey == current_key_)) {
       out_parameter.any_parameter_allowed = true;
     }
   }
@@ -647,6 +654,13 @@ void FillNotificationData::UpdateParameters(
     out_parameter[current_key_].insert(
         policy_table::EnumToJsonString(*it_parameters));
   }
+
+  // We should reset ALL DISALLOWED flags if at least one parameter is allowed
+  // due to a logical OR permissions check
+  if (IsSomeParameterAllowed(out_parameter)) {
+    out_parameter.any_parameter_disallowed_by_policy = false;
+    out_parameter.any_parameter_disallowed_by_user = false;
+  }
 }
 
 void FillNotificationData::ExcludeSame(RpcPermissions& rpc) {
@@ -769,16 +783,24 @@ bool FillNotificationData::RpcParametersEmpty(RpcPermissions& rpc) {
          no_user_disallowed_parameters;
 }
 
-bool FillNotificationData::IsSectionEmpty(ParameterPermissions& permissions,
-                                          const std::string& section) {
+bool FillNotificationData::IsSectionEmpty(
+    const ParameterPermissions& permissions, const std::string& section) const {
   ParameterPermissions::const_iterator it_section = permissions.find(section);
   ParameterPermissions::const_iterator end = permissions.end();
   if (end != it_section) {
-    return permissions[section].empty();
+    return it_section->second.empty();
   }
   return true;
 }
 
+bool FillNotificationData::IsSomeParameterAllowed(
+    const ParameterPermissions& permissions) const {
+  const bool are_any_consented_parameters_allowed =
+      kAllowedKey == current_key_ && !IsSectionEmpty(permissions, current_key_);
+  return permissions.any_parameter_allowed ||
+         are_any_consented_parameters_allowed;
+}
+
 ProcessFunctionalGroup::ProcessFunctionalGroup(
     const policy_table::FunctionalGroupings& fg,
     const std::vector<FunctionalGroupPermission>& group_permissions,
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
index 56de26af64..c7d814e56e 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -49,12 +49,9 @@
 #include "policy/cache_manager.h"
 #include "policy/update_status_manager.h"
 #include "config_profile/profile.h"
-#include "utils/make_shared.h"
 
-#ifdef SDL_REMOTE_CONTROL
 #include "policy/access_remote.h"
 #include "policy/access_remote_impl.h"
-#endif  // SDL_REMOTE_CONTROL
 
 policy::PolicyManager* CreateManager() {
   return new policy::PolicyManagerImpl();
@@ -216,47 +213,41 @@ PolicyManagerImpl::PolicyManagerImpl()
     : PolicyManager()
     , listener_(NULL)
     , cache_(new CacheManager)
-#ifdef SDL_REMOTE_CONTROL
-    , access_remote_(new AccessRemoteImpl(
-          CacheManagerInterfaceSPtr::static_pointer_cast<CacheManager>(cache_)))
-#endif  // SDL_REMOTE_CONTROL
+    , access_remote_(
+          new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_)))
     , retry_sequence_timeout_(60)
     , retry_sequence_index_(0)
     , ignition_check(true)
-    , retry_sequence_url_(0, 0, "") {
-}
+    , retry_sequence_url_(0, 0, "") {}
 
 PolicyManagerImpl::PolicyManagerImpl(bool in_memory)
     : PolicyManager()
     , listener_(NULL)
     , cache_(new CacheManager(in_memory))
-#ifdef SDL_REMOTE_CONTROL
-    , access_remote_(new AccessRemoteImpl(
-          CacheManagerInterfaceSPtr::static_pointer_cast<CacheManager>(cache_)))
-#endif  // SDL_REMOTE_CONTROL
+    , access_remote_(
+          new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_)))
     , retry_sequence_timeout_(60)
     , retry_sequence_index_(0)
     , ignition_check(true)
     , retry_sequence_url_(0, 0, "")
     , wrong_ptu_update_received_(false)
     , send_on_update_sent_out_(false)
-    , trigger_ptu_(false) {
-}
+    , trigger_ptu_(false) {}
 
 void PolicyManagerImpl::set_listener(PolicyListener* listener) {
   listener_ = listener;
   update_status_manager_.set_listener(listener);
 }
 
-utils::SharedPtr<policy_table::Table> PolicyManagerImpl::Parse(
+std::shared_ptr<policy_table::Table> PolicyManagerImpl::Parse(
     const BinaryMessage& pt_content) {
   std::string json(pt_content.begin(), pt_content.end());
   Json::Value value;
   Json::Reader reader;
   if (reader.parse(json.c_str(), value)) {
-    return new policy_table::Table(&value);
+    return std::make_shared<policy_table::Table>(&value);
   } else {
-    return utils::SharedPtr<policy_table::Table>();
+    return std::make_shared<policy_table::Table>();
   }
 }
 
@@ -288,7 +279,7 @@ bool PolicyManagerImpl::LoadPT(const std::string& file,
       "PTU content is: " << std::string(pt_content.begin(), pt_content.end()));
 
   // Parse message into table struct
-  utils::SharedPtr<policy_table::Table> pt_update = Parse(pt_content);
+  std::shared_ptr<policy_table::Table> pt_update = Parse(pt_content);
   if (!pt_update) {
     LOG4CXX_WARN(logger_, "Parsed table pointer is NULL.");
     update_status_manager_.OnWrongUpdateReceived();
@@ -310,7 +301,7 @@ bool PolicyManagerImpl::LoadPT(const std::string& file,
     sync_primitives::AutoLock lock(apps_registration_lock_);
 
     // Get current DB data, since it could be updated during awaiting of PTU
-    utils::SharedPtr<policy_table::Table> policy_table_snapshot =
+    std::shared_ptr<policy_table::Table> policy_table_snapshot =
         cache_->GenerateSnapshot();
     if (!policy_table_snapshot) {
       LOG4CXX_ERROR(
@@ -372,8 +363,8 @@ bool PolicyManagerImpl::LoadPT(const std::string& file,
 }
 
 CheckAppPolicyResults PolicyManagerImpl::CheckPermissionsChanges(
-    const utils::SharedPtr<policy_table::Table> pt_update,
-    const utils::SharedPtr<policy_table::Table> snapshot) {
+    const std::shared_ptr<policy_table::Table> pt_update,
+    const std::shared_ptr<policy_table::Table> snapshot) {
   LOG4CXX_INFO(logger_, "Checking incoming permissions.");
 
   // Replace predefined policies with its actual setting, e.g. "123":"default"
@@ -477,7 +468,7 @@ void PolicyManagerImpl::GetUpdateUrls(const uint32_t service_type,
 
 void PolicyManagerImpl::RequestPTUpdate() {
   LOG4CXX_AUTO_TRACE(logger_);
-  utils::SharedPtr<policy_table::Table> policy_table_snapshot =
+  std::shared_ptr<policy_table::Table> policy_table_snapshot =
       cache_->GenerateSnapshot();
   if (!policy_table_snapshot) {
     LOG4CXX_ERROR(logger_, "Failed to create snapshot of policy table");
@@ -792,13 +783,11 @@ void PolicyManagerImpl::SendNotificationOnPermissionsUpdated(
   LOG4CXX_INFO(logger_,
                "Send notification for application_id:" << application_id);
 
-#ifdef SDL_REMOTE_CONTROL
   const ApplicationOnDevice who = {device_id, application_id};
   if (access_remote_->IsAppRemoteControl(who)) {
     listener()->OnPermissionsUpdated(application_id, notification_data);
     return;
   }
-#endif  // SDL_REMOTE_CONTROL
 
   std::string default_hmi;
   GetDefaultHmi(application_id, &default_hmi);
@@ -1287,7 +1276,7 @@ bool PolicyManagerImpl::ExceededIgnitionCycles() {
 }
 
 bool PolicyManagerImpl::IsPTValid(
-    utils::SharedPtr<policy_table::Table> policy_table,
+    std::shared_ptr<policy_table::Table> policy_table,
     policy_table::PolicyTableType type) const {
   policy_table->SetPolicyTableType(type);
   if (!policy_table->is_valid()) {
@@ -1378,7 +1367,7 @@ void PolicyManagerImpl::SendPermissionsToApp(
   Permissions notification_data;
 
   // Need to get rid of this call
-  utils::SharedPtr<policy_table::Table> policy_table_snapshot =
+  std::shared_ptr<policy_table::Table> policy_table_snapshot =
       cache_->GenerateSnapshot();
 
   PrepareNotificationData(
@@ -1507,7 +1496,7 @@ void PolicyManagerImpl::CalculateGroupsConsentFromExternalConsent(
 bool PolicyManagerImpl::ExceededDays() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  TimevalStruct current_time = date_time::DateTime::getCurrentTime();
+  date_time::TimeDuration current_time = date_time::getCurrentTime();
   const int kSecondsInDay = 60 * 60 * 24;
   const int days = current_time.tv_sec / kSecondsInDay;
 
@@ -1786,16 +1775,11 @@ StatusNotifier PolicyManagerImpl::AddApplication(
   sync_primitives::AutoLock lock(apps_registration_lock_);
   if (IsNewApplication(application_id)) {
     AddNewApplication(application_id, device_consent);
-    return utils::MakeShared<CallStatusChange>(update_status_manager_,
-                                               device_consent);
+    return std::make_shared<CallStatusChange>(update_status_manager_,
+                                              device_consent);
   } else {
     PromoteExistedApplication(application_id, device_consent);
-    if (helpers::in_range(hmi_types, policy_table::AHT_NAVIGATION) &&
-        !HasCertificate()) {
-      LOG4CXX_DEBUG(logger_, "Certificate does not exist, scheduling update.");
-      update_status_manager_.ScheduleUpdate();
-    }
-    return utils::MakeShared<utils::CallNothing>();
+    return std::make_shared<utils::CallNothing>();
   }
 }
 
@@ -1925,7 +1909,7 @@ void PolicyManagerImpl::SaveUpdateStatusRequired(bool is_update_needed) {
 
 void PolicyManagerImpl::set_cache_manager(
     CacheManagerInterface* cache_manager) {
-  cache_ = cache_manager;
+  cache_ = std::shared_ptr<CacheManagerInterface>(cache_manager);
 }
 
 std::ostream& operator<<(std::ostream& output,
@@ -1938,7 +1922,6 @@ std::ostream& operator<<(std::ostream& output,
   return output;
 }
 
-#ifdef SDL_REMOTE_CONTROL
 void PolicyManagerImpl::SetDefaultHmiTypes(const std::string& application_id,
                                            const std::vector<int>& hmi_types) {
   LOG4CXX_INFO(logger_, "SetDefaultHmiTypes");
@@ -2041,9 +2024,8 @@ bool PolicyManagerImpl::GetModuleTypes(
 }
 
 void PolicyManagerImpl::set_access_remote(
-    utils::SharedPtr<AccessRemote> access_remote) {
+    std::shared_ptr<AccessRemote> access_remote) {
   access_remote_ = access_remote;
 }
-#endif  // SDL_REMOTE_CONTROL
 
 }  //  namespace policy
diff --git a/src/components/policy/policy_external/src/policy_table.cc b/src/components/policy/policy_external/src/policy_table.cc
index 7a63fac50d..8ca6b698d1 100644
--- a/src/components/policy/policy_external/src/policy_table.cc
+++ b/src/components/policy/policy_external/src/policy_table.cc
@@ -42,7 +42,7 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "Policy")
 
 PolicyTable::PolicyTable() : pt_data_(new SQLPTExtRepresentation()) {}
 
-PolicyTable::PolicyTable(utils::SharedPtr<PTRepresentation> pt_data)
+PolicyTable::PolicyTable(std::shared_ptr<PTRepresentation> pt_data)
     : pt_data_(pt_data) {}
 
 PolicyTable::~PolicyTable() {
diff --git a/src/components/policy/policy_external/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc
index 881ae8cbf9..31a6fc86e6 100644
--- a/src/components/policy/policy_external/src/policy_table/enums.cc
+++ b/src/components/policy/policy_external/src/policy_table/enums.cc
@@ -118,6 +118,8 @@ bool IsValidEnum(Parameter val) {
       return true;
     case P_EXTERNALTEMPERATURE:
       return true;
+    case P_TURNSIGNAL:
+      return true;
     case P_FUELLEVEL:
       return true;
     case P_FUELLEVEL_STATE:
@@ -140,6 +142,8 @@ bool IsValidEnum(Parameter val) {
       return true;
     case P_BELTSTATUS:
       return true;
+    case P_ELECTRONICPARKBRAKESTATUS:
+      return true;
     case P_DRIVERBRAKING:
       return true;
     case P_PRNDL:
@@ -166,8 +170,6 @@ bool IsValidEnum(Parameter val) {
       return true;
     case P_ABS_STATE:
       return true;
-    case P_TURN_SIGNAL:
-      return true;
     case P_FUEL_RANGE:
       return true;
     case P_TIRE_PRESSURE_VALUE:
@@ -211,6 +213,8 @@ const char* EnumToJsonString(Parameter val) {
       return "engineTorque";
     case P_EXTERNALTEMPERATURE:
       return "externalTemperature";
+    case P_TURNSIGNAL:
+      return "turnSignal";
     case P_FUELLEVEL:
       return "fuelLevel";
     case P_FUELLEVEL_STATE:
@@ -233,6 +237,8 @@ const char* EnumToJsonString(Parameter val) {
       return "accPedalPosition";
     case P_BELTSTATUS:
       return "beltStatus";
+    case P_ELECTRONICPARKBRAKESTATUS:
+      return "electronicParkBrakeStatus";
     case P_DRIVERBRAKING:
       return "driverBraking";
     case P_PRNDL:
@@ -259,8 +265,6 @@ const char* EnumToJsonString(Parameter val) {
       return "eCallInfo";
     case P_ABS_STATE:
       return "abs_State";
-    case P_TURN_SIGNAL:
-      return "turnSignal";
     case P_FUEL_RANGE:
       return "fuelRange";
     case P_TIRE_PRESSURE_VALUE:
@@ -307,6 +311,9 @@ bool EnumFromJsonString(const std::string& literal, Parameter* result) {
   } else if ("externalTemperature" == literal) {
     *result = P_EXTERNALTEMPERATURE;
     return true;
+  } else if ("turnSignal" == literal) {
+    *result = P_TURNSIGNAL;
+    return true;
   } else if ("fuelLevel" == literal) {
     *result = P_FUELLEVEL;
     return true;
@@ -340,6 +347,9 @@ bool EnumFromJsonString(const std::string& literal, Parameter* result) {
   } else if ("beltStatus" == literal) {
     *result = P_BELTSTATUS;
     return true;
+  } else if ("electronicParkBrakeStatus" == literal) {
+    *result = P_ELECTRONICPARKBRAKESTATUS;
+    return true;
   } else if ("driverBraking" == literal) {
     *result = P_DRIVERBRAKING;
     return true;
@@ -379,9 +389,6 @@ bool EnumFromJsonString(const std::string& literal, Parameter* result) {
   } else if ("abs_State" == literal) {
     *result = P_ABS_STATE;
     return true;
-  } else if ("turnSignal" == literal) {
-    *result = P_TURN_SIGNAL;
-    return true;
   } else if ("fuelRange" == literal) {
     *result = P_FUEL_RANGE;
     return true;
@@ -758,13 +765,22 @@ bool EnumFromJsonString(const std::string& literal, RequestType* result) {
   }
 }
 
-#ifdef SDL_REMOTE_CONTROL
 bool IsValidEnum(ModuleType val) {
   switch (val) {
     case MT_CLIMATE:
       return true;
     case MT_RADIO:
       return true;
+    case MT_AUDIO:
+      return true;
+    case MT_LIGHT:
+      return true;
+    case MT_HMI_SETTINGS:
+      return true;
+    case MT_SEAT:
+      return true;
+    case MT_EMPTY:
+      return true;
     default:
       return false;
   }
@@ -775,6 +791,16 @@ const char* EnumToJsonString(ModuleType val) {
       return "CLIMATE";
     case MT_RADIO:
       return "RADIO";
+    case MT_AUDIO:
+      return "AUDIO";
+    case MT_LIGHT:
+      return "LIGHT";
+    case MT_HMI_SETTINGS:
+      return "HMI_SETTINGS";
+    case MT_SEAT:
+      return "SEAT";
+    case MT_EMPTY:
+      return "EMPTY";
     default:
       return "";
   }
@@ -787,11 +813,25 @@ bool EnumFromJsonString(const std::string& literal, ModuleType* result) {
   } else if ("RADIO" == literal) {
     *result = MT_RADIO;
     return true;
+  } else if ("SEAT" == literal) {
+    *result = MT_SEAT;
+    return true;
+  } else if ("AUDIO" == literal) {
+    *result = MT_AUDIO;
+    return true;
+  } else if ("LIGHT" == literal) {
+    *result = MT_LIGHT;
+    return true;
+  } else if ("HMI_SETTINGS" == literal) {
+    *result = MT_HMI_SETTINGS;
+    return true;
+  } else if ("EMPTY" == literal) {
+    *result = MT_EMPTY;
+    return true;
   } else {
     return false;
   }
 }
-#endif  // SDL_REMOTE_CONTROL
 
 const std::string kDefaultApp = "default";
 const std::string kPreDataConsentApp = "pre_DataConsent";
diff --git a/src/components/policy/policy_external/src/policy_table/types.cc b/src/components/policy/policy_external/src/policy_table/types.cc
index 6d0bc9d697..5922a020e6 100644
--- a/src/components/policy/policy_external/src/policy_table/types.cc
+++ b/src/components/policy/policy_external/src/policy_table/types.cc
@@ -241,11 +241,7 @@ ApplicationParams::ApplicationParams(const Json::Value* value__)
     , RequestSubType(impl::ValueMember(value__, "RequestSubType"))
     , memory_kb(impl::ValueMember(value__, "memory_kb"), 0)
     , heart_beat_timeout_ms(impl::ValueMember(value__, "heart_beat_timeout_ms"))
-#ifdef SDL_REMOTE_CONTROL
-    , moduleType(impl::ValueMember(value__, "moduleType"))
-#endif  // SDL_REMOTE_CONTROL
-{
-}
+    , moduleType(impl::ValueMember(value__, "moduleType")) {}
 
 Json::Value ApplicationParams::ToJsonValue() const {
   Json::Value result__(PolicyBase::ToJsonValue());
@@ -256,9 +252,7 @@ Json::Value ApplicationParams::ToJsonValue() const {
   impl::WriteJsonField("memory_kb", memory_kb, &result__);
   impl::WriteJsonField(
       "heart_beat_timeout_ms", heart_beat_timeout_ms, &result__);
-#ifdef SDL_REMOTE_CONTROL
   impl::WriteJsonField("moduleType", moduleType, &result__);
-#endif  // SDL_REMOTE_CONTROL
   return result__;
 }
 
@@ -280,11 +274,9 @@ bool ApplicationParams::is_valid() const {
   if (!heart_beat_timeout_ms.is_valid()) {
     return false;
   }
-#ifdef SDL_REMOTE_CONTROL
   if (!moduleType.is_valid()) {
     return false;
   }
-#endif  // SDL_REMOTE_CONTROL
   return Validate();
 }
 
@@ -314,11 +306,9 @@ bool ApplicationParams::struct_empty() const {
   if (heart_beat_timeout_ms.is_initialized()) {
     return false;
   }
-#ifdef SDL_REMOTE_CONTROL
   if (moduleType.is_initialized()) {
     return false;
   }
-#endif  // SDL_REMOTE_CONTROL
   return true;
 }
 
@@ -364,12 +354,9 @@ void ApplicationParams::ReportErrors(rpc::ValidationReport* report__) const {
     heart_beat_timeout_ms.ReportErrors(
         &report__->ReportSubobject("heart_beat_timeout_ms"));
   }
-
-#ifdef SDL_REMOTE_CONTROL
   if (!moduleType.is_valid()) {
     moduleType.ReportErrors(&report__->ReportSubobject("moduleType"));
   }
-#endif  // SDL_REMOTE_CONTROL
 }
 
 void ApplicationParams::SetPolicyTableType(PolicyTableType pt_type) {
@@ -379,9 +366,7 @@ void ApplicationParams::SetPolicyTableType(PolicyTableType pt_type) {
   RequestSubType.SetPolicyTableType(pt_type);
   memory_kb.SetPolicyTableType(pt_type);
   heart_beat_timeout_ms.SetPolicyTableType(pt_type);
-#ifdef SDL_REMOTE_CONTROL
   moduleType.SetPolicyTableType(pt_type);
-#endif  // SDL_REMOTE_CONTROL
 }
 
 // RpcParameters methods
@@ -584,7 +569,9 @@ ModuleConfig::ModuleConfig(const Json::Value* value__)
     , vehicle_year(impl::ValueMember(value__, "vehicle_year"))
     , preloaded_date(impl::ValueMember(value__, "preloaded_date"))
     , certificate(impl::ValueMember(value__, "certificate"))
-    , preloaded_pt(impl::ValueMember(value__, "preloaded_pt")) {}
+    , preloaded_pt(impl::ValueMember(value__, "preloaded_pt"))
+    , full_app_id_supported(
+          impl::ValueMember(value__, "full_app_id_supported")) {}
 
 void ModuleConfig::SafeCopyFrom(const ModuleConfig& from) {
   exchange_after_x_days = from.exchange_after_x_days;
@@ -607,6 +594,8 @@ Json::Value ModuleConfig::ToJsonValue() const {
   Json::Value result__(Json::objectValue);
   impl::WriteJsonField("certificate", certificate, &result__);
   impl::WriteJsonField("preloaded_pt", preloaded_pt, &result__);
+  impl::WriteJsonField(
+      "full_app_id_supported", full_app_id_supported, &result__);
   impl::WriteJsonField("exchange_after_x_ignition_cycles",
                        exchange_after_x_ignition_cycles,
                        &result__);
@@ -637,6 +626,9 @@ bool ModuleConfig::is_valid() const {
   if (!preloaded_pt.is_valid()) {
     return false;
   }
+  if (!full_app_id_supported.is_valid()) {
+    return false;
+  }
   if (!exchange_after_x_ignition_cycles.is_valid()) {
     return false;
   }
@@ -687,6 +679,9 @@ bool ModuleConfig::struct_empty() const {
   if (preloaded_pt.is_initialized()) {
     return false;
   }
+  if (full_app_id_supported.is_initialized()) {
+    return false;
+  }
 
   if (exchange_after_x_ignition_cycles.is_initialized()) {
     return false;
@@ -735,6 +730,10 @@ void ModuleConfig::ReportErrors(rpc::ValidationReport* report__) const {
   if (!preloaded_pt.is_valid()) {
     preloaded_pt.ReportErrors(&report__->ReportSubobject("preloaded_pt"));
   }
+  if (!full_app_id_supported.is_valid()) {
+    full_app_id_supported.ReportErrors(
+        &report__->ReportSubobject("full_app_id_supported"));
+  }
   if (!exchange_after_x_ignition_cycles.is_valid()) {
     exchange_after_x_ignition_cycles.ReportErrors(
         &report__->ReportSubobject("exchange_after_x_ignition_cycles"));
@@ -812,6 +811,7 @@ void ModuleConfig::SetPolicyTableType(PolicyTableType pt_type) {
   CompositeType::SetPolicyTableType(pt_type);
   certificate.SetPolicyTableType(pt_type);
   preloaded_pt.SetPolicyTableType(pt_type);
+  full_app_id_supported.SetPolicyTableType(pt_type);
   exchange_after_x_ignition_cycles.SetPolicyTableType(pt_type);
   exchange_after_x_kilometers.SetPolicyTableType(pt_type);
   exchange_after_x_days.SetPolicyTableType(pt_type);
diff --git a/src/components/policy/policy_external/src/policy_table/validation.cc b/src/components/policy/policy_external/src/policy_table/validation.cc
index 6936948c84..9b227615d8 100644
--- a/src/components/policy/policy_external/src/policy_table/validation.cc
+++ b/src/components/policy/policy_external/src/policy_table/validation.cc
@@ -164,7 +164,6 @@ bool ApplicationPoliciesSection::Validate() const {
   return true;
 }
 
-#ifdef SDL_REMOTE_CONTROL
 bool ApplicationParams::ValidateModuleTypes() const {
   // moduleType is optional so see Optional<T>::is_valid()
   bool is_initialized = moduleType->is_initialized();
@@ -194,7 +193,6 @@ bool ApplicationParams::ValidateModuleTypes() const {
   }
   return true;
 }
-#endif  // SDL_REMOTE_CONTROL
 
 bool ApplicationParams::Validate() const {
   if (is_initialized()) {
@@ -206,11 +204,7 @@ bool ApplicationParams::Validate() const {
       }
     }
   }
-#ifdef SDL_REMOTE_CONTROL
   return ValidateModuleTypes();
-#else   // SDL_REMOTE_CONTROL
-  return true;
-#endif  // SDL_REMOTE_CONTROL
 }
 
 bool RpcParameters::Validate() const {
diff --git a/src/components/policy/policy_external/src/sql_pt_ext_representation.cc b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc
index 5bb602244e..f26264ddf9 100644
--- a/src/components/policy/policy_external/src/sql_pt_ext_representation.cc
+++ b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc
@@ -761,6 +761,13 @@ bool SQLPTExtRepresentation::SaveSpecificAppPolicy(
   if (!SaveAppGroup(app.first, app.second.groups)) {
     return false;
   }
+
+  bool denied = !app.second.moduleType->is_initialized();
+  if (!SaveRemoteControlDenied(app.first, denied) ||
+      !SaveModuleType(app.first, *app.second.moduleType)) {
+    return false;
+  }
+
   if (!SaveNickname(app.first, *app.second.nicknames)) {
     return false;
   }
@@ -870,6 +877,17 @@ bool SQLPTExtRepresentation::GatherApplicationPoliciesSection(
     if (!GatherAppGroup(app_id, &params.groups)) {
       return false;
     }
+
+    bool denied = false;
+    if (!GatherRemoteControlDenied(app_id, &denied)) {
+      return false;
+    }
+    if (!denied) {
+      if (!GatherModuleType(app_id, &*params.moduleType)) {
+        return false;
+      }
+    }
+
     if (!GatherNickName(app_id, &*params.nicknames)) {
       return false;
     }
diff --git a/src/components/policy/policy_external/src/sql_pt_representation.cc b/src/components/policy/policy_external/src/sql_pt_representation.cc
index b05716dc3f..34c5b90903 100644
--- a/src/components/policy/policy_external/src/sql_pt_representation.cc
+++ b/src/components/policy/policy_external/src/sql_pt_representation.cc
@@ -235,10 +235,10 @@ int SQLPTRepresentation::TimeoutResponse() {
   utils::dbms::SQLQuery query(db());
   if (!query.Prepare(sql_pt::kSelectTimeoutResponse) || !query.Exec()) {
     LOG4CXX_INFO(logger_, "Can not select timeout response for retry sequence");
-    const int defaultTimeout = 30 * date_time::DateTime::MILLISECONDS_IN_SECOND;
+    const int defaultTimeout = 30 * date_time::MILLISECONDS_IN_SECOND;
     return defaultTimeout;
   }
-  return query.GetInteger(0) * date_time::DateTime::MILLISECONDS_IN_SECOND;
+  return query.GetInteger(0) * date_time::MILLISECONDS_IN_SECOND;
 }
 
 bool SQLPTRepresentation::SecondsBetweenRetries(std::vector<int>* seconds) {
@@ -513,10 +513,10 @@ bool SQLPTRepresentation::RefreshDB() {
   return true;
 }
 
-utils::SharedPtr<policy_table::Table> SQLPTRepresentation::GenerateSnapshot()
+std::shared_ptr<policy_table::Table> SQLPTRepresentation::GenerateSnapshot()
     const {
   LOG4CXX_AUTO_TRACE(logger_);
-  utils::SharedPtr<policy_table::Table> table = new policy_table::Table();
+  auto table = std::make_shared<policy_table::Table>();
   GatherModuleMeta(&*table->policy_table.module_meta);
   GatherModuleConfig(&table->policy_table.module_config);
   GatherUsageAndErrorCounts(&*table->policy_table.usage_and_error_counts);
@@ -765,7 +765,6 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection(
       return false;
     }
 
-#ifdef SDL_REMOTE_CONTROL
     bool denied = false;
     if (!GatherRemoteControlDenied(app_id, &denied)) {
       return false;
@@ -775,7 +774,6 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection(
         return false;
       }
     }
-#endif  // SDL_REMOTE_CONTROL
 
     if (!GatherNickName(app_id, &*params.nicknames)) {
       return false;
@@ -1051,14 +1049,11 @@ bool SQLPTRepresentation::SaveSpecificAppPolicy(
     return false;
   }
 
-#ifdef SDL_REMOTE_CONTROL
-
   bool denied = !app.second.moduleType->is_initialized();
   if (!SaveRemoteControlDenied(app.first, denied) ||
       !SaveModuleType(app.first, *app.second.moduleType)) {
     return false;
   }
-#endif  // SDL_REMOTE_CONTROL
 
   if (!SaveNickname(app.first, *app.second.nicknames)) {
     return false;
@@ -1714,8 +1709,6 @@ bool SQLPTRepresentation::GatherAppGroup(
   return true;
 }
 
-#ifdef SDL_REMOTE_CONTROL
-
 bool SQLPTRepresentation::GatherRemoteControlDenied(const std::string& app_id,
                                                     bool* denied) const {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1747,6 +1740,10 @@ bool SQLPTRepresentation::GatherModuleType(
     if (!policy_table::EnumFromJsonString(query.GetString(0), &type)) {
       return false;
     }
+    if (policy_table::ModuleType::MT_EMPTY == type) {
+      app_types->mark_initialized();
+      continue;
+    }
     app_types->push_back(type);
   }
   return true;
@@ -1779,18 +1776,30 @@ bool SQLPTRepresentation::SaveModuleType(
   }
 
   policy_table::ModuleTypes::const_iterator it;
-  for (it = types.begin(); it != types.end(); ++it) {
+  if (!types.empty()) {
+    for (it = types.begin(); it != types.end(); ++it) {
+      query.Bind(0, app_id);
+      std::string module(policy_table::EnumToJsonString(*it));
+      query.Bind(1, module);
+      LOG4CXX_DEBUG(logger_,
+                    "Module(app: " << app_id << ", type: " << module << ")");
+      if (!query.Exec() || !query.Reset()) {
+        LOG4CXX_WARN(logger_, "Incorrect insert into module type.");
+        return false;
+      }
+    }
+  } else if (types.is_initialized()) {
     query.Bind(0, app_id);
-    std::string module(policy_table::EnumToJsonString(*it));
-    query.Bind(1, module);
-    LOG4CXX_DEBUG(logger_,
-                  "Module(app: " << app_id << ", type: " << module << ")");
+    query.Bind(1,
+               std::string(policy_table::EnumToJsonString(
+                   policy_table::ModuleType::MT_EMPTY)));
     if (!query.Exec() || !query.Reset()) {
-      LOG4CXX_WARN(logger_, "Incorrect insert into module type.");
+      LOG4CXX_WARN(logger_, "Incorrect insert into module types.");
       return false;
     }
+  } else {
+    LOG4CXX_WARN(logger_, "Module Type omitted.");
   }
-
   return true;
 }
 
@@ -1905,7 +1914,6 @@ bool SQLPTRepresentation::GatherRemoteRpc(
   }
   return true;
 }
-#endif  // SDL_REMOTE_CONTROL
 
 bool SQLPTRepresentation::SaveApplicationCustomData(const std::string& app_id,
                                                     bool is_revoked,
diff --git a/src/components/policy/policy_external/src/status.cc b/src/components/policy/policy_external/src/status.cc
index 31fc7f110b..c2ee4e4bbc 100644
--- a/src/components/policy/policy_external/src/status.cc
+++ b/src/components/policy/policy_external/src/status.cc
@@ -32,7 +32,6 @@
 
 #include "policy/status.h"
 #include "policy/update_status_manager.h"
-#include "utils/make_shared.h"
 
 policy::UpToDateStatus::UpToDateStatus()
     : Status(kUpToDate, policy::PolicyTableStatus::StatusUpToDate) {}
@@ -45,7 +44,7 @@ void policy::UpToDateStatus::ProcessEvent(UpdateStatusManager* manager,
     case kScheduleUpdate:
     case kScheduleManualUpdate:
     case kOnResetRetrySequence:
-      manager->SetNextStatus(utils::MakeShared<UpdateNeededStatus>());
+      manager->SetNextStatus(std::make_shared<UpdateNeededStatus>());
       break;
     default:
       break;
@@ -59,14 +58,14 @@ void policy::UpdateNeededStatus::ProcessEvent(
     policy::UpdateStatusManager* manager, policy::UpdateEvent event) {
   switch (event) {
     case kOnUpdateSentOut:
-      manager->SetNextStatus(utils::MakeShared<UpdatingStatus>());
+      manager->SetNextStatus(std::make_shared<UpdatingStatus>());
       break;
     case kOnResetPolicyTableRequireUpdate:
-      manager->SetNextStatus(utils::MakeShared<UpToDateStatus>());
-      manager->SetPostponedStatus(utils::MakeShared<UpdateNeededStatus>());
+      manager->SetNextStatus(std::make_shared<UpToDateStatus>());
+      manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
       break;
     case kOnResetPolicyTableNoUpdate:
-      manager->SetNextStatus(utils::MakeShared<UpToDateStatus>());
+      manager->SetNextStatus(std::make_shared<UpToDateStatus>());
       break;
     default:
       break;
@@ -85,23 +84,23 @@ void policy::UpdatingStatus::ProcessEvent(policy::UpdateStatusManager* manager,
   switch (event) {
     case kOnValidUpdateReceived:
     case kOnResetPolicyTableNoUpdate:
-      manager->SetNextStatus(utils::MakeShared<UpToDateStatus>());
+      manager->SetNextStatus(std::make_shared<UpToDateStatus>());
       break;
     case kOnNewAppRegistered:
-      manager->SetPostponedStatus(utils::MakeShared<UpdateNeededStatus>());
+      manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
       break;
     case kOnWrongUpdateReceived:
     case kOnUpdateTimeout:
-      manager->SetNextStatus(utils::MakeShared<UpdateNeededStatus>());
+      manager->SetNextStatus(std::make_shared<UpdateNeededStatus>());
       break;
     case kOnResetPolicyTableRequireUpdate:
-      manager->SetNextStatus(utils::MakeShared<UpToDateStatus>());
-      manager->SetPostponedStatus(utils::MakeShared<UpdateNeededStatus>());
+      manager->SetNextStatus(std::make_shared<UpToDateStatus>());
+      manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
       break;
     case kScheduleUpdate:
     case kScheduleManualUpdate:
     case kOnResetRetrySequence:
-      manager->SetPostponedStatus(utils::MakeShared<UpdateNeededStatus>());
+      manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
       break;
     default:
       break;
diff --git a/src/components/policy/policy_external/src/update_status_manager.cc b/src/components/policy/policy_external/src/update_status_manager.cc
index 087db1149b..e738554799 100644
--- a/src/components/policy/policy_external/src/update_status_manager.cc
+++ b/src/components/policy/policy_external/src/update_status_manager.cc
@@ -33,7 +33,6 @@
 #include "policy/update_status_manager.h"
 #include "policy/policy_listener.h"
 #include "utils/logger.h"
-#include "utils/make_shared.h"
 
 namespace policy {
 
@@ -41,7 +40,7 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "Policy")
 
 UpdateStatusManager::UpdateStatusManager()
     : listener_(NULL)
-    , current_status_(utils::MakeShared<UpToDateStatus>())
+    , current_status_(std::make_shared<UpToDateStatus>())
     , last_processed_event_(kNoEvent)
     , apps_search_in_progress_(false)
     , app_registered_from_non_consented_device_(true) {
@@ -67,11 +66,11 @@ void UpdateStatusManager::ProcessEvent(UpdateEvent event) {
   DoTransition();
 }
 
-void UpdateStatusManager::SetNextStatus(utils::SharedPtr<Status> status) {
+void UpdateStatusManager::SetNextStatus(std::shared_ptr<Status> status) {
   next_status_ = status;
 }
 
-void UpdateStatusManager::SetPostponedStatus(utils::SharedPtr<Status> status) {
+void UpdateStatusManager::SetPostponedStatus(std::shared_ptr<Status> status) {
   postponed_status_ = status;
 }
 
@@ -210,7 +209,6 @@ UpdateStatusManager::UpdateThreadDelegate::UpdateThreadDelegate(
     UpdateStatusManager* update_status_manager)
     : timeout_(0)
     , stop_flag_(false)
-    , state_lock_(true)
     , update_status_manager_(update_status_manager) {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(logger_, "Create UpdateThreadDelegate");
diff --git a/src/components/policy/policy_external/src/usage_statistics/counter.cc b/src/components/policy/policy_external/src/usage_statistics/counter.cc
index 661ea29704..d46f6a315a 100644
--- a/src/components/policy/policy_external/src/usage_statistics/counter.cc
+++ b/src/components/policy/policy_external/src/usage_statistics/counter.cc
@@ -36,13 +36,13 @@
 #include <cassert>
 #include "policy/usage_statistics/counter.h"
 #include "utils/date_time.h"
-#include "utils/make_shared.h"
+
 #include "utils/timer_task_impl.h"
 
 namespace usage_statistics {
 
 GlobalCounter::GlobalCounter(
-    utils::SharedPtr<usage_statistics::StatisticsManager> statistics_manager,
+    std::shared_ptr<usage_statistics::StatisticsManager> statistics_manager,
     GlobalCounterId counter_type)
     : counter_type_(counter_type), statistics_manager_(statistics_manager) {}
 
@@ -53,7 +53,7 @@ void GlobalCounter::operator++() const {
 }
 
 AppCounter::AppCounter(
-    utils::SharedPtr<usage_statistics::StatisticsManager> statistics_manager,
+    std::shared_ptr<usage_statistics::StatisticsManager> statistics_manager,
     const std::string& app_id,
     AppCounterId counter_type)
     : app_id_(app_id)
@@ -67,7 +67,7 @@ void AppCounter::operator++() const {
 }
 
 AppInfo::AppInfo(
-    utils::SharedPtr<usage_statistics::StatisticsManager> statistics_manager,
+    std::shared_ptr<usage_statistics::StatisticsManager> statistics_manager,
     const std::string& app_id,
     AppInfoId info_type)
     : app_id_(app_id)
@@ -81,7 +81,7 @@ void AppInfo::Update(const std::string& new_info) const {
 }
 
 AppStopwatchImpl::AppStopwatchImpl(
-    utils::SharedPtr<usage_statistics::StatisticsManager> statistics_manager,
+    std::shared_ptr<usage_statistics::StatisticsManager> statistics_manager,
     const std::string& app_id)
     : app_id_(app_id)
     , stopwatch_type_(SECONDS_HMI_NONE)
@@ -92,7 +92,7 @@ AppStopwatchImpl::AppStopwatchImpl(
     , time_out_(60) {}
 
 AppStopwatchImpl::AppStopwatchImpl(
-    utils::SharedPtr<StatisticsManager> statistics_manager,
+    std::shared_ptr<StatisticsManager> statistics_manager,
     const std::string& app_id,
     uint32_t timeout)
     : app_id_(app_id)
@@ -107,8 +107,7 @@ AppStopwatchImpl::~AppStopwatchImpl() {}
 
 void AppStopwatchImpl::Start(AppStopwatchId stopwatch_type) {
   stopwatch_type_ = stopwatch_type;
-  timer_.Start(time_out_ * date_time::DateTime::MILLISECONDS_IN_SECOND,
-               timer::kPeriodic);
+  timer_.Start(time_out_ * date_time::MILLISECONDS_IN_SECOND, timer::kPeriodic);
 }
 
 void AppStopwatchImpl::Switch(AppStopwatchId stopwatch_type) {
diff --git a/src/components/policy/policy_external/test/CMakeLists.txt b/src/components/policy/policy_external/test/CMakeLists.txt
index a455d43b91..8b77c90dd2 100644
--- a/src/components/policy/policy_external/test/CMakeLists.txt
+++ b/src/components/policy/policy_external/test/CMakeLists.txt
@@ -55,12 +55,6 @@ file (GLOB POLICY_TEST_SOURCES
 list (REMOVE_ITEM POLICY_TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/policy_manager_impl_stress_test.cc)
 
-if (REMOTE_CONTROL)
-  list (APPEND testSources
-    access_remote_impl_test.cc
-  )
-endif ()
-
 create_test("policy_test" "${POLICY_TEST_SOURCES}" "${testLibraries}")
 
 #Additional test files (json)
diff --git a/src/components/policy/policy_external/test/counter_test.cc b/src/components/policy/policy_external/test/counter_test.cc
index 90f247de31..22b19c878e 100644
--- a/src/components/policy/policy_external/test/counter_test.cc
+++ b/src/components/policy/policy_external/test/counter_test.cc
@@ -28,6 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include "gtest/gtest.h"
 #include "policy/usage_statistics/mock_statistics_manager.h"
 #include "policy/usage_statistics/counter.h"
@@ -45,7 +46,7 @@ TEST(
     StatisticsManagerIncrementMethod1Arg,
     GlobalCounterOverloadedIncrement_CallONCE_StatisticsManagerIncrementCalledONCE) {
   // Arrange
-  MockStatisticsManager* msm = new StrictMock<MockStatisticsManager>();
+  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
   GlobalCounter reboots_counter(msm, SYNC_REBOOTS);
 
   // Assert
@@ -59,7 +60,7 @@ TEST(
     StatisticsManagerIncrementMethod1Arg,
     GlobalCounterOverloadedIncrement_CallTWICE_StatisticsManagerIncrementCalledTWICE) {
   // Arrange
-  MockStatisticsManager* msm = new StrictMock<MockStatisticsManager>();
+  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
   GlobalCounter reboots_counter(msm, SYNC_REBOOTS);
 
   // Assert
@@ -74,7 +75,7 @@ TEST(
     StatisticsManagerIncrementMethod2Args,
     AppCounterOverloadedIncrement_CallONCE_StatisticsManagerIncrementCalledONCE) {
   // Arrange
-  MockStatisticsManager* msm = new StrictMock<MockStatisticsManager>();
+  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
   AppCounter user_selections_counter(msm, "HelloApp", USER_SELECTIONS);
 
   // Assert
@@ -88,7 +89,7 @@ TEST(
     StatisticsManagerIncrementMethod2Args,
     AppCounterOverloadedIncrement_CallTWICE_StatisticsManagerIncrementCalledTWICE) {
   // Arrange
-  MockStatisticsManager* msm = new StrictMock<MockStatisticsManager>();
+  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
   AppCounter user_selections_counter(msm, "HelloApp", USER_SELECTIONS);
 
   // Assert
@@ -102,7 +103,7 @@ TEST(
 TEST(StatisticsManagerSetMethod,
      AppInfoUpdateMethod_CallONCE_StatisticsManagerSetMethodCalledONCE) {
   // Arrange
-  MockStatisticsManager* msm = new StrictMock<MockStatisticsManager>();
+  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
   AppInfo gui_language_info(msm, "HelloApp", LANGUAGE_GUI);
 
   // Assert
@@ -115,7 +116,7 @@ TEST(StatisticsManagerSetMethod,
 TEST(StatisticsManagerSetMethod,
      AppInfoUpdateMethod_CallTWICE_StatisticsManagerSetMethodCalledTWICE) {
   // Arrange
-  MockStatisticsManager* msm = new StrictMock<MockStatisticsManager>();
+  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
   AppInfo gui_language_info(msm, "HelloApp", LANGUAGE_GUI);
 
   // Assert
@@ -130,7 +131,7 @@ TEST(StatisticsManagerSetMethod,
 TEST(StatisticsManagerAddMethod,
      AppStopwatchStartMethod_CallONCE_StatisticsManagerAddMethodCalledONCE) {
   // Arrange
-  MockStatisticsManager* msm = new StrictMock<MockStatisticsManager>();
+  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
   const std::uint32_t time_out = 1;
   AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp", time_out);
 
@@ -145,7 +146,7 @@ TEST(StatisticsManagerAddMethod,
 TEST(StatisticsManagerAddMethod,
      AppStopwatchSwitchMethod_Call_StatisticsManagerAddMethodCalled) {
   // Arrange
-  MockStatisticsManager* msm = new StrictMock<MockStatisticsManager>();
+  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
   AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp");
   hmi_full_stopwatch.Start(SECONDS_HMI_FULL);
 
@@ -161,7 +162,7 @@ TEST(
     StatisticsManagerAddMethod,
     AppStopwatchSwitchMethod_CallAnd1SecSleepAfter_StatisticsManagerAddMethodCalledWith1SecTimespan) {
   // Arrange
-  MockStatisticsManager* msm = new StrictMock<MockStatisticsManager>();
+  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
   const std::uint32_t time_out = 1;
   AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp", time_out);
 
diff --git a/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h b/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h
index 995c63ed20..3870e4ece1 100644
--- a/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h
+++ b/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h
@@ -78,7 +78,7 @@ class MockPTRepresentation : virtual public ::policy::PTRepresentation {
   MOCK_METHOD0(Close, bool());
   MOCK_METHOD0(Clear, bool());
   MOCK_METHOD0(Drop, bool());
-  MOCK_CONST_METHOD0(GenerateSnapshot, utils::SharedPtr<policy_table::Table>());
+  MOCK_CONST_METHOD0(GenerateSnapshot, std::shared_ptr<policy_table::Table>());
   MOCK_METHOD1(Save, bool(const policy_table::Table& table));
   MOCK_CONST_METHOD0(UpdateRequired, bool());
   MOCK_METHOD1(SaveUpdateRequired, void(bool value));
diff --git a/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h b/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h
index e753751308..23701e86de 100644
--- a/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h
+++ b/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h
@@ -54,7 +54,7 @@ using ::policy::PolicyManagerImpl;
 typedef std::multimap<std::string, policy_table::Rpcs&>
     UserConsentPromptToRpcsConnections;
 
-typedef utils::SharedPtr<policy_table::Table> PolicyTableSPtr;
+typedef std::shared_ptr<policy_table::Table> PolicyTableSPtr;
 
 namespace {
 const std::string kSdlPreloadedPtJson = "json/sdl_preloaded_pt.json";
@@ -203,7 +203,7 @@ class PolicyManagerImplTest2 : public ::testing::Test {
 
   void EmulatePTAppRevoked(const std::string& ptu_name);
 
-  utils::SharedPtr<policy_table::Table> PreconditionForBasicValidateSnapshot();
+  std::shared_ptr<policy_table::Table> PreconditionForBasicValidateSnapshot();
 
   template <typename ParentType, typename Value>
   bool IsKeyExisted(const ParentType& parent, const Value& value) const {
@@ -236,7 +236,7 @@ class PolicyManagerImplTest_RequestTypes : public ::testing::Test {
   const std::string app_storage_folder_;
   const std::string preloaded_pt_filename_;
 
-  utils::SharedPtr<PolicyManagerImpl> policy_manager_impl_sptr_;
+  std::shared_ptr<PolicyManagerImpl> policy_manager_impl_sptr_;
   NiceMock<MockPolicyListener> listener_;
   NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
 
diff --git a/src/components/policy/policy_external/test/json/PTU.json b/src/components/policy/policy_external/test/json/PTU.json
index c231340f44..4cd71d6004 100644
--- a/src/components/policy/policy_external/test/json/PTU.json
+++ b/src/components/policy/policy_external/test/json/PTU.json
@@ -403,6 +403,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -419,6 +420,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -435,6 +437,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -451,6 +454,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -475,6 +479,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -498,6 +503,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -521,6 +527,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -543,6 +550,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/PTU2.json b/src/components/policy/policy_external/test/json/PTU2.json
index 4970c40e60..9c9436144e 100644
--- a/src/components/policy/policy_external/test/json/PTU2.json
+++ b/src/components/policy/policy_external/test/json/PTU2.json
@@ -403,6 +403,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -419,6 +420,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -435,6 +437,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -451,6 +454,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -475,6 +479,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -498,6 +503,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -521,6 +527,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -543,6 +550,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/PTU3.json b/src/components/policy/policy_external/test/json/PTU3.json
index 98037cf594..279051e7bf 100644
--- a/src/components/policy/policy_external/test/json/PTU3.json
+++ b/src/components/policy/policy_external/test/json/PTU3.json
@@ -403,6 +403,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -419,6 +420,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -435,6 +437,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -451,6 +454,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -475,6 +479,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -498,6 +503,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -521,6 +527,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -543,6 +550,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json b/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json
index f232d8fec7..08027f2786 100644
--- a/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json
@@ -1438,6 +1438,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1450,6 +1451,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1462,6 +1464,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1474,6 +1477,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1595,6 +1599,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1612,6 +1617,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1629,6 +1635,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1645,6 +1652,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json b/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json
index 942c862d4f..a88bcfbd08 100644
--- a/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json
+++ b/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json
@@ -1441,6 +1441,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1453,6 +1454,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1465,6 +1467,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1477,6 +1480,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1598,6 +1602,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1615,6 +1620,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1632,6 +1638,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1648,6 +1655,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json b/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json
index c72fdbe6cb..250bfb21f2 100644
--- a/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json
+++ b/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json
@@ -1438,6 +1438,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1450,6 +1451,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1462,6 +1464,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1474,6 +1477,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1595,6 +1599,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1612,6 +1617,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1629,6 +1635,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1645,6 +1652,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json b/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json
index b783ac0cc2..85910c098c 100644
--- a/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json
+++ b/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json
@@ -1437,6 +1437,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1449,6 +1450,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1461,6 +1463,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1473,6 +1476,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1594,6 +1598,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1611,6 +1616,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1628,6 +1634,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1644,6 +1651,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json
index fdf730917f..1c1b04ca2b 100644
--- a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json
+++ b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json
@@ -296,6 +296,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -308,6 +309,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -320,6 +322,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -332,6 +335,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -352,6 +356,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -371,6 +376,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -390,6 +396,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -408,6 +415,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json
index 82b6f762ca..51690d7b8e 100644
--- a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json
+++ b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json
@@ -296,6 +296,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -308,6 +309,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -320,6 +322,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -332,6 +335,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -352,6 +356,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -371,6 +376,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -390,6 +396,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -408,6 +415,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json b/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json
index 713d057f1a..cfa6c4010c 100644
--- a/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json
+++ b/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json
@@ -296,6 +296,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -308,6 +309,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -320,6 +322,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -332,6 +335,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -352,6 +356,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -371,6 +376,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -390,6 +396,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -408,6 +415,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/ptu2_requestType.json b/src/components/policy/policy_external/test/json/ptu2_requestType.json
index 4765da0771..d7177f2251 100644
--- a/src/components/policy/policy_external/test/json/ptu2_requestType.json
+++ b/src/components/policy/policy_external/test/json/ptu2_requestType.json
@@ -415,6 +415,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -431,6 +432,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -447,6 +449,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -463,6 +466,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -487,6 +491,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -510,6 +515,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -533,6 +539,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -555,6 +562,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/ptu_requestType.json b/src/components/policy/policy_external/test/json/ptu_requestType.json
index 5e34c00a81..6a531dd2ad 100644
--- a/src/components/policy/policy_external/test/json/ptu_requestType.json
+++ b/src/components/policy/policy_external/test/json/ptu_requestType.json
@@ -414,6 +414,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -430,6 +431,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -446,6 +448,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -462,6 +465,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -486,6 +490,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -509,6 +514,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -532,6 +538,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -554,6 +561,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json
index ced0a9d603..59e3f947c3 100644
--- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json
+++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json
@@ -297,6 +297,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -309,6 +310,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -321,6 +323,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -333,6 +336,7 @@
                         "LIMITED"],
                         "parameters": ["accPedalPosition",
                         "beltStatus",
+                        "electronicParkBrakeStatus",
                         "driverBraking",
                         "myKey",
                         "prndl",
@@ -353,6 +357,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -372,6 +377,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -391,6 +397,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
@@ -409,6 +416,7 @@
                         "engineOilLife",
                         "engineTorque",
                         "externalTemperature",
+                        "turnSignal",
                         "fuelLevel",
                         "fuelLevel_State",
                         "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json
index 5974b22b8e..a4491fd449 100644
--- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json
+++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json
@@ -2051,6 +2051,7 @@
             [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -2065,6 +2066,7 @@
             [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -2079,6 +2081,7 @@
             [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -2093,6 +2096,7 @@
             [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -2311,6 +2315,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -2332,6 +2337,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -2353,6 +2359,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -2373,6 +2380,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json
index 8da6906e8b..83c4ccf15c 100644
--- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json
+++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json
@@ -415,6 +415,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -431,6 +432,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -447,6 +449,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -463,6 +466,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -487,6 +491,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -510,6 +515,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -533,6 +539,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -555,6 +562,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_pt_first_update.json b/src/components/policy/policy_external/test/json/sdl_pt_first_update.json
index f8be46d2b5..7b882c6ceb 100644
--- a/src/components/policy/policy_external/test/json/sdl_pt_first_update.json
+++ b/src/components/policy/policy_external/test/json/sdl_pt_first_update.json
@@ -1431,6 +1431,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1443,6 +1444,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1455,6 +1457,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1467,6 +1470,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1612,6 +1616,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1629,6 +1634,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1646,6 +1652,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1662,6 +1669,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_pt_second_update.json b/src/components/policy/policy_external/test/json/sdl_pt_second_update.json
index fe7b036f94..7d90275328 100644
--- a/src/components/policy/policy_external/test/json/sdl_pt_second_update.json
+++ b/src/components/policy/policy_external/test/json/sdl_pt_second_update.json
@@ -1431,6 +1431,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1443,6 +1444,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1455,6 +1457,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1467,6 +1470,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1612,6 +1616,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1629,6 +1634,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1646,6 +1652,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1662,6 +1669,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_pt_update.json b/src/components/policy/policy_external/test/json/sdl_pt_update.json
index c79fd26873..807b0eb312 100644
--- a/src/components/policy/policy_external/test/json/sdl_pt_update.json
+++ b/src/components/policy/policy_external/test/json/sdl_pt_update.json
@@ -1431,6 +1431,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1443,6 +1444,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1455,6 +1457,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1467,6 +1470,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1596,6 +1600,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1613,6 +1618,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1630,6 +1636,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1646,6 +1653,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json
index 234f57f2db..3d0a004dbe 100644
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json
@@ -414,6 +414,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -430,6 +431,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -446,6 +448,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -462,6 +465,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -486,6 +490,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -509,6 +514,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -532,6 +538,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -554,6 +561,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json
index d309d58674..6a36f1f9c5 100644
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json
@@ -414,6 +414,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -430,6 +431,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -446,6 +448,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -462,6 +465,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -486,6 +490,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -509,6 +514,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -532,6 +538,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -554,6 +561,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json
index be38e7d706..3303d56844 100644
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json
@@ -414,6 +414,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -430,6 +431,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -446,6 +448,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -462,6 +465,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -486,6 +490,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -509,6 +514,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -532,6 +538,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -554,6 +561,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json
index 8686f20f0e..e7a33ba2c0 100644
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json
@@ -414,6 +414,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -430,6 +431,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -446,6 +448,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -462,6 +465,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -486,6 +490,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -509,6 +514,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -532,6 +538,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -554,6 +561,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json
index b9b693ed5b..08739f9d6a 100644
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json
@@ -414,6 +414,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -430,6 +431,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -446,6 +448,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -462,6 +465,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -486,6 +490,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -509,6 +514,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -532,6 +538,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -554,6 +561,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json
index 8bbf7ea421..21396b8cac 100644
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json
@@ -414,6 +414,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -430,6 +431,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -446,6 +448,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -462,6 +465,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -486,6 +490,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -509,6 +514,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -532,6 +538,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -554,6 +561,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json
index 146adaf7a7..5aa467a23c 100644
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json
@@ -414,6 +414,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -430,6 +431,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -446,6 +448,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -462,6 +465,7 @@
             "parameters": [
               "accPedalPosition",
               "beltStatus",
+              "electronicParkBrakeStatus",
               "driverBraking",
               "myKey",
               "prndl",
@@ -486,6 +490,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -509,6 +514,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -532,6 +538,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
@@ -554,6 +561,7 @@
               "engineOilLife",
               "engineTorque",
               "externalTemperature",
+              "turnSignal",
               "fuelLevel",
               "fuelLevel_State",
               "headLampStatus",
diff --git a/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json b/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json
index bc8d95302c..5827ab287a 100644
--- a/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json
+++ b/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json
@@ -1431,6 +1431,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1443,6 +1444,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1455,6 +1457,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1467,6 +1470,7 @@
                   "parameters" : [
                      "accPedalPosition",
                      "beltStatus",
+                     "electronicParkBrakeStatus",
                      "driverBraking",
                      "myKey",
                      "prndl",
@@ -1588,6 +1592,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1605,6 +1610,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1622,6 +1628,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
@@ -1638,6 +1645,7 @@
                      "engineOilLife",
                      "engineTorque",
                      "externalTemperature",
+                     "turnSignal",
                      "fuelLevel",
                      "fuelLevel_State",
                      "headLampStatus",
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
index 947bb5d3ad..8d2802c831 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
@@ -757,18 +757,18 @@ TEST_F(PolicyManagerImplTest2,
   policy_manager_->CheckPermissions(
       application_id_, kHmiLevelFull, "SendLocation", input_params, output);
 
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_undefined_params.size());
+  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
+  EXPECT_TRUE(output.list_of_undefined_params.empty());
+  EXPECT_EQ(10u, output.list_of_allowed_params.size());
   ResetOutputList(output);
 
   // Rpc in LIMITED level
   policy_manager_->CheckPermissions(
       application_id_, kHmiLevelLimited, "SendLocation", input_params, output);
 
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_undefined_params.size());
+  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
+  EXPECT_TRUE(output.list_of_undefined_params.empty());
+  EXPECT_EQ(10u, output.list_of_allowed_params.size());
   ResetOutputList(output);
 
   // Rpc in BACKGROUND level
@@ -778,9 +778,9 @@ TEST_F(PolicyManagerImplTest2,
                                     input_params,
                                     output);
 
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_undefined_params.size());
+  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
+  EXPECT_TRUE(output.list_of_undefined_params.empty());
+  EXPECT_EQ(10u, output.list_of_allowed_params.size());
   // Reset output
   ResetOutputList(output);
 
@@ -845,17 +845,17 @@ TEST_F(PolicyManagerImplTest2,
   policy_manager_->CheckPermissions(
       application_id_, kHmiLevelFull, "SendLocation", input_params, output);
 
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_undefined_params.size());
+  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
+  EXPECT_TRUE(output.list_of_undefined_params.empty());
+  EXPECT_EQ(10u, output.list_of_allowed_params.size());
   ResetOutputList(output);
 
   // Rpc in LIMITED level
   policy_manager_->CheckPermissions(
       application_id_, kHmiLevelLimited, "SendLocation", input_params, output);
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_undefined_params.size());
+  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
+  EXPECT_TRUE(output.list_of_undefined_params.empty());
+  EXPECT_EQ(10u, output.list_of_allowed_params.size());
   ResetOutputList(output);
 
   // Rpc in BACKGROUND level
@@ -864,9 +864,9 @@ TEST_F(PolicyManagerImplTest2,
                                     "SendLocation",
                                     input_params,
                                     output);
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_undefined_params.size());
+  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
+  EXPECT_TRUE(output.list_of_undefined_params.empty());
+  EXPECT_EQ(10u, output.list_of_allowed_params.size());
   // Reset output
   ResetOutputList(output);
 
@@ -924,7 +924,7 @@ TEST_F(
 }
 
 uint32_t GetCurrentDaysCount() {
-  TimevalStruct current_time = date_time::DateTime::getCurrentTime();
+  date_time::TimeDuration current_time = date_time::getCurrentTime();
   const uint32_t kSecondsInDay = 60 * 60 * 24;
   return current_time.tv_sec / kSecondsInDay;
 }
@@ -1092,7 +1092,7 @@ TEST_F(PolicyManagerImplTest2,
   // Arrange
   CreateLocalPT(preloaded_pt_filename_);
   GetPTU(kValidSdlPtUpdateJson);
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       (policy_manager_->GetCache())->GetPT();
   policy_table::ModuleConfig& module_config = pt->policy_table.module_config;
   ::policy::VehicleInfo vehicle_info = policy_manager_->GetVehicleInfo();
@@ -1202,7 +1202,7 @@ TEST_F(
     HertBeatTimeout_AddApp_UpdateAppPolicies_ExpectReceivedHertBeatTimeoutCorrect) {
   // Arrange
   CreateLocalPT(preloaded_pt_filename_);
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       (policy_manager_->GetCache())->GetPT();
   ::policy_table::PolicyTableType type1 =
       ::policy_table::PolicyTableType::PT_PRELOADED;
@@ -1302,7 +1302,7 @@ TEST_F(PolicyManagerImplTest2,
             actual_groups_permissions[index].group_name);
   EXPECT_EQ(group1_perm.group_id, actual_groups_permissions[index].group_id);
   EXPECT_EQ(group1_perm.state, actual_groups_permissions[index].state);
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       (policy_manager_->GetCache())->GetPT();
   uint32_t ucr_size = 0;
   ::policy_table::DeviceData& device_data = *pt->policy_table.device_data;
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc
index e666ac82de..c1ff31f748 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc
@@ -84,7 +84,7 @@ TEST_F(PolicyManagerImplTest2, UpdatedPreloadedPT_ExpectLPT_IsUpdated) {
   EXPECT_TRUE(cache->IsPTPreloaded());
 
   // Arrange
-  utils::SharedPtr<policy_table::Table> table = cache->GenerateSnapshot();
+  std::shared_ptr<policy_table::Table> table = cache->GenerateSnapshot();
   // Get FunctionalGroupings
   policy_table::FunctionalGroupings& fc =
       table->policy_table.functional_groupings;
@@ -119,7 +119,7 @@ TEST_F(PolicyManagerImplTest2,
   // Arrange
   CreateLocalPT(preloaded_pt_filename_);
   policy_manager_->SetSystemLanguage("it-it");
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       (policy_manager_->GetCache())->GetPT();
   ::policy_table::ModuleMeta& ModuleMeta = *(pt->policy_table.module_meta);
   EXPECT_EQ("it-it", static_cast<std::string>(*(ModuleMeta.language)));
@@ -130,7 +130,7 @@ TEST_F(PolicyManagerImplTest2, SetVINValue_ExpectVINSetSuccessfully) {
   CreateLocalPT(preloaded_pt_filename_);
   std::string vin_code("1FAPP6242VH100001");
   policy_manager_->SetVINValue(vin_code);
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       (policy_manager_->GetCache())->GetPT();
   ::policy_table::ModuleMeta& ModuleMeta = *(pt->policy_table.module_meta);
   EXPECT_EQ(vin_code, static_cast<std::string>(*(ModuleMeta.vin)));
@@ -141,7 +141,7 @@ TEST_F(PolicyManagerImplTest2, SetSystemInfo_ExpectSystemInfoSetSuccessfully) {
   CreateLocalPT(preloaded_pt_filename_);
   policy_manager_->SetSystemInfo("4.1.3.B_EB355B", "WAEGB", "ru-ru");
   policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-  utils::SharedPtr<policy_table::Table> pt = cache->GetPT();
+  std::shared_ptr<policy_table::Table> pt = cache->GetPT();
   ::policy_table::ModuleMeta& ModuleMeta = *(pt->policy_table.module_meta);
   EXPECT_EQ("ru-ru", static_cast<std::string>(*(ModuleMeta.language)));
   EXPECT_EQ("4.1.3.B_EB355B",
@@ -189,7 +189,7 @@ TEST_F(PolicyManagerImplTest2, CleanUnpairedDevice_ExpectDevicesDeleted) {
   policy_manager_->AddDevice("AAA123456789RRR", "Bluetooth");
   policy_manager_->SetDeviceInfo("AAA123456789RRR", dev_info3);
 
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       (policy_manager_->GetCache())->GetPT();
   // Try to find first device in PT
   policy_table::DeviceData::const_iterator iter =
@@ -316,7 +316,7 @@ TEST_F(PolicyManagerImplTest2, AddDevice_RegisterDevice_TRUE) {
   const bool result =
       (policy_manager_->GetCache())->AddDevice(device_id_1_, connection_type);
   // Get Policy table
-  const utils::SharedPtr<policy_table::Table> policy_table =
+  const std::shared_ptr<policy_table::Table> policy_table =
       policy_manager_->GetCache()->GetPT();
   // Get preloaded_pt flag from Policy table
   const bool is_preloaded_pt =
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_test.cc
index f4e922e647..6521db7c36 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_test.cc
@@ -37,8 +37,6 @@
 #include <utility>
 
 #include "policy/policy_manager_impl_test_base.h"
-#include "utils/make_shared.h"
-#include "utils/shared_ptr.h"
 
 using ::testing::_;
 using ::testing::Return;
@@ -148,8 +146,8 @@ TEST_F(PolicyManagerImplTest, LoadPT_SetPT_PTIsLoaded) {
   std::string json = table.toStyledString();
   ::policy::BinaryMessage msg(json.begin(), json.end());
 
-  utils::SharedPtr<policy_table::Table> snapshot =
-      new policy_table::Table(update.policy_table);
+  std::shared_ptr<policy_table::Table> snapshot =
+      std::make_shared<policy_table::Table>(update.policy_table);
   // Assert
   EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(snapshot));
   EXPECT_CALL(*cache_manager_, ApplyUpdate(_)).WillOnce(Return(true));
@@ -236,9 +234,9 @@ TEST_F(PolicyManagerImplTest2, TimeOutExchange) {
 TEST_F(PolicyManagerImplTest,
        RequestPTUpdate_SetPT_GeneratedSnapshotAndPTUpdate) {
   Json::Value table = createPTforLoad();
-  utils::SharedPtr<policy_table::Table> p_table =
-      utils::MakeShared<policy_table::Table>(&table);
-  ASSERT_TRUE(p_table);
+  std::shared_ptr<policy_table::Table> p_table =
+      std::make_shared<policy_table::Table>(&table);
+  ASSERT_TRUE(p_table.get());
   p_table->SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
   EXPECT_TRUE(IsValid(*p_table));
 
@@ -249,9 +247,9 @@ TEST_F(PolicyManagerImplTest,
 }
 
 TEST_F(PolicyManagerImplTest, RequestPTUpdate_InvalidPT_PTUpdateFail) {
-  utils::SharedPtr<policy_table::Table> p_table =
-      utils::MakeShared<policy_table::Table>();
-  ASSERT_TRUE(p_table);
+  std::shared_ptr<policy_table::Table> p_table =
+      std::make_shared<policy_table::Table>();
+  ASSERT_TRUE(p_table.get());
   EXPECT_FALSE(IsValid(*p_table));
 
   EXPECT_CALL(listener_, OnSnapshotCreated(_, _, _)).Times(0);
@@ -261,7 +259,7 @@ TEST_F(PolicyManagerImplTest, RequestPTUpdate_InvalidPT_PTUpdateFail) {
 }
 
 TEST_F(PolicyManagerImplTest, RequestPTUpdate_InvalidSnapshot_PTUpdateFail) {
-  utils::SharedPtr<policy_table::Table> p_table;
+  std::shared_ptr<policy_table::Table> p_table;
   EXPECT_FALSE(p_table);
 
   EXPECT_CALL(listener_, OnSnapshotCreated(_, _, _)).Times(0);
@@ -355,7 +353,7 @@ TEST_F(
 
   PreconditionExternalConsentPreparePTWithAppGroupsAndConsents();
 
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       policy_manager_->GetCache()->GetPT();
 
   // Checking groups consents before setting ExternalConsent status
@@ -420,7 +418,7 @@ TEST_F(
   PreconditionExternalConsentPreparePTWithAppGroupsAndConsents();
 
   // Act
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       policy_manager_->GetCache()->GetPT();
 
   // Checking ExternalConsent consents before setting new ExternalConsent status
@@ -484,7 +482,7 @@ TEST_F(
   PreconditionExternalConsentPreparePTWithAppPolicy();
 
   // Act
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       policy_manager_->GetCache()->GetPT();
 
   ExternalConsentStatus status;
@@ -552,7 +550,7 @@ TEST_F(
   PreconditionExternalConsentPreparePTWithAppPolicy();
 
   // Act
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       policy_manager_->GetCache()->GetPT();
 
   ExternalConsentStatus status;
@@ -634,7 +632,7 @@ TEST_F(
                                   HmiTypes(policy_table::AHT_DEFAULT));
 
   // Act
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       policy_manager_->GetCache()->GetPT();
 
   ExternalConsentStatus status;
@@ -724,7 +722,7 @@ TEST_F(
                                   HmiTypes(policy_table::AHT_DEFAULT));
 
   // Act
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       policy_manager_->GetCache()->GetPT();
 
   ExternalConsentStatus status;
@@ -818,7 +816,7 @@ TEST_F(PolicyManagerImplTest_ExternalConsent,
   policy_manager_->AddApplication(app_id_1_,
                                   HmiTypes(policy_table::AHT_DEFAULT));
 
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       policy_manager_->GetCache()->GetPT();
 
   // Check ExternalConsent consents for application
@@ -943,7 +941,7 @@ TEST_F(PolicyManagerImplTest_ExternalConsent,
   policy_manager_->AddApplication(app_id_1_,
                                   HmiTypes(policy_table::AHT_DEFAULT));
 
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       policy_manager_->GetCache()->GetPT();
 
   // Check ExternalConsent consents for application
@@ -1046,7 +1044,7 @@ TEST_F(
   PreconditionExternalConsentPreparePTWithAppGroupsAndConsents();
 
   // Act
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       policy_manager_->GetCache()->GetPT();
 
   // Checking ExternalConsent consents before setting new ExternalConsent status
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
index 48e86d24b7..86b7cdc9ef 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
@@ -38,7 +38,7 @@
 #include "policy/policy_manager_impl_test_base.h"
 
 #include "utils/file_system.h"
-#include "utils/make_shared.h"
+
 #include "utils/gen_hash.h"
 #include "json/reader.h"
 
@@ -414,7 +414,7 @@ void PolicyManagerImplTest2::GetFunctionalGroupingsFromManager(
   // Get cache
   ::policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
   // Get table_snapshot
-  utils::SharedPtr<policy_table::Table> table = cache->GenerateSnapshot();
+  std::shared_ptr<policy_table::Table> table = cache->GenerateSnapshot();
   // Set functional groupings from policy table
   input_functional_groupings = table->policy_table.functional_groupings;
 }
@@ -639,7 +639,7 @@ void PolicyManagerImplTest_RequestTypes::SetUp() {
 
   file_system::CreateDirectory(app_storage_folder_);
   const bool in_memory = true;
-  policy_manager_impl_sptr_ = utils::MakeShared<PolicyManagerImpl>(in_memory);
+  policy_manager_impl_sptr_ = std::make_shared<PolicyManagerImpl>(in_memory);
   policy_manager_impl_sptr_->set_listener(&listener_);
 }
 
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc
index 2f2162494f..4df4012ad3 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc
@@ -69,7 +69,7 @@ TEST_F(
   // To set UP_TO_DATE before registration
   GetPTU(kValidSdlPtUpdateJson);
 
-  const TimevalStruct current_time = date_time::DateTime::getCurrentTime();
+  const date_time::TimeDuration current_time = date_time::getCurrentTime();
   const int kSecondsInDay = 60 * 60 * 24;
   const int days_after_epoch = current_time.tv_sec / kSecondsInDay;
 
@@ -395,7 +395,7 @@ TEST_F(PolicyManagerImplTest2,
   uint32_t size = result.size();
   EXPECT_GT(size, 0u);
   std::vector< ::policy::UserFriendlyMessage>::iterator result_iter;
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       (policy_manager_->GetCache())->GetPT();
 
   policy_table::ConsumerFriendlyMessages& consumer_friendly_messages =
@@ -456,7 +456,7 @@ TEST_F(PolicyManagerImplTest2,
 TEST_F(PolicyManagerImplTest2, SetDeviceInfo_ExpectDevInfoAddedToPT) {
   // Arrange
   ::policy::DeviceInfo dev_info;
-  utils::SharedPtr<policy_table::Table> pt =
+  std::shared_ptr<policy_table::Table> pt =
       (policy_manager_->GetCache())->GetPT();
   dev_info.hardware = "hardware IPX";
   dev_info.firmware_rev = "v.8.0.1";
diff --git a/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc b/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc
index 92525c646d..b87598b986 100644
--- a/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc
+++ b/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc
@@ -44,8 +44,6 @@
 #include "rpc_base/rpc_base.h"
 #include "policy/policy_table/types.h"
 #include "policy/mock_policy_settings.h"
-#include "utils/shared_ptr.h"
-#include "utils/make_shared.h"
 
 using namespace ::policy;
 namespace policy_table = rpc::policy_table_interface_base;
@@ -393,7 +391,7 @@ TEST_F(SQLPTExtRepresentationTest,
   ASSERT_TRUE(reps_->Save(update));
 
   // Act
-  utils::SharedPtr<policy_table::Table> snapshot = reps_->GenerateSnapshot();
+  std::shared_ptr<policy_table::Table> snapshot = reps_->GenerateSnapshot();
   snapshot->SetPolicyTableType(rpc::policy_table_interface_base::PT_SNAPSHOT);
 
   policy_table["module_meta"] = Json::Value(Json::objectValue);
@@ -1506,7 +1504,7 @@ TEST_F(SQLPTExtRepresentationTest, SaveUserConsentRecords_ExpectedSaved) {
 
   // Act
   EXPECT_TRUE(reps_->Save(original_table));
-  utils::SharedPtr<Table> loaded_table = reps_->GenerateSnapshot();
+  std::shared_ptr<Table> loaded_table = reps_->GenerateSnapshot();
 
   // GetData/GetKeyData methods do internal existence check - no need to do it
   // separately. In case of data is missing expectations will be violated.
@@ -1591,7 +1589,7 @@ TEST_F(SQLPTExtRepresentationTest, SaveFunctionalGroupings_ExpectedSaved) {
 
   // Act
   EXPECT_TRUE(reps_->Save(original_table));
-  utils::SharedPtr<Table> loaded_table = reps_->GenerateSnapshot();
+  std::shared_ptr<Table> loaded_table = reps_->GenerateSnapshot();
 
   FunctionalGroupings loaded_groupings =
       GetData<Table, FunctionalGroupings>(*loaded_table);
diff --git a/src/components/policy/policy_external/test/sql_pt_representation_test.cc b/src/components/policy/policy_external/test/sql_pt_representation_test.cc
index 0b0831eaad..b0f340b0f2 100644
--- a/src/components/policy/policy_external/test/sql_pt_representation_test.cc
+++ b/src/components/policy/policy_external/test/sql_pt_representation_test.cc
@@ -49,7 +49,6 @@
 #include "policy/policy_table/enums.h"
 #include "rpc_base/rpc_base.h"
 #include "policy/mock_policy_settings.h"
-#include "utils/shared_ptr.h"
 
 namespace policy_table = rpc::policy_table_interface_base;
 using policy::SQLPTRepresentation;
@@ -81,14 +80,14 @@ class SQLPTRepresentationTest : public SQLPTRepresentation,
   static const std::string kDatabaseName;
   static utils::dbms::SQLQuery* query_wrapper_;
   // Gtest can show message that this object doesn't destroyed
-  static std::auto_ptr<policy_handler_test::MockPolicySettings>
+  static std::unique_ptr<policy_handler_test::MockPolicySettings>
       policy_settings_;
 
   static void SetUpTestCase() {
     const std::string kAppStorageFolder = "storage_SQLPTRepresentationTest";
     reps = new SQLPTRepresentation(in_memory_);
     ASSERT_TRUE(reps != NULL);
-    policy_settings_ = std::auto_ptr<policy_handler_test::MockPolicySettings>(
+    policy_settings_ = std::unique_ptr<policy_handler_test::MockPolicySettings>(
         new policy_handler_test::MockPolicySettings());
     ON_CALL(*policy_settings_, app_storage_folder())
         .WillByDefault(ReturnRef(kAppStorageFolder));
@@ -348,7 +347,7 @@ SQLPTRepresentation* SQLPTRepresentationTest::reps = 0;
 utils::dbms::SQLQuery* SQLPTRepresentationTest::query_wrapper_ = 0;
 const std::string SQLPTRepresentationTest::kDatabaseName = ":memory:";
 const bool SQLPTRepresentationTest::in_memory_ = true;
-std::auto_ptr<policy_handler_test::MockPolicySettings>
+std::unique_ptr<policy_handler_test::MockPolicySettings>
     SQLPTRepresentationTest::policy_settings_;
 
 class SQLPTRepresentationTest2 : public ::testing::Test {
@@ -1585,7 +1584,7 @@ TEST_F(SQLPTRepresentationTest,
   ASSERT_TRUE(reps->Save(update));
 
   // Act
-  utils::SharedPtr<policy_table::Table> snapshot = reps->GenerateSnapshot();
+  std::shared_ptr<policy_table::Table> snapshot = reps->GenerateSnapshot();
   snapshot->SetPolicyTableType(rpc::policy_table_interface_base::PT_SNAPSHOT);
   // Remove fields which must be absent in snapshot
   table["policy_table"]["consumer_friendly_messages"].removeMember("messages");
diff --git a/src/components/policy/policy_external/test/update_status_manager_test.cc b/src/components/policy/policy_external/test/update_status_manager_test.cc
index 5546984ff4..278c4fc43a 100644
--- a/src/components/policy/policy_external/test/update_status_manager_test.cc
+++ b/src/components/policy/policy_external/test/update_status_manager_test.cc
@@ -34,7 +34,7 @@
 #include "policy/mock_policy_listener.h"
 #include "policy/policy_manager_impl.h"
 #include "policy/update_status_manager.h"
-#include "utils/make_shared.h"
+
 #include "utils/conditional_variable.h"
 
 namespace test {
@@ -48,7 +48,7 @@ using testing::NiceMock;
 
 class UpdateStatusManagerTest : public ::testing::Test {
  protected:
-  utils::SharedPtr<UpdateStatusManager> manager_;
+  std::shared_ptr<UpdateStatusManager> manager_;
   PolicyTableStatus status_;
   const uint32_t k_timeout_;
   NiceMock<MockPolicyListener> listener_;
@@ -58,7 +58,7 @@ class UpdateStatusManagerTest : public ::testing::Test {
 
  public:
   UpdateStatusManagerTest()
-      : manager_(utils::MakeShared<UpdateStatusManager>())
+      : manager_(std::make_shared<UpdateStatusManager>())
       , k_timeout_(1000)
       , listener_()
       , up_to_date_status_("UP_TO_DATE")